X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=target%2Fimagebuilder%2FMakefile;h=9e9afb2b273cfec3859bee6fac218c8ea874de23;hb=67f09fa245578c136ac34804dad41f1e1d694e48;hp=dcd5ca82cc53cdea25ea3f8dbe08769a67917a62;hpb=5d0bc04a7eebd19fc6ff013047e8aa4465eb5583;p=openwrt.git

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index dcd5ca82cc..9e9afb2b27 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -1,15 +1,16 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 6070 2007-01-10 21:21:59Z nbd $
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
 
+override MAKEFLAGS=
+
 PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m | sed "s/ //g")
 
@@ -21,24 +22,28 @@ all: compile
 
 $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
 	rm -rf $(PKG_BUILD_DIR)
-	mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host $(PKG_BUILD_DIR)/target
+	mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host \
+		$(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts
+	-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
 	$(CP) \
-		$(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
-		$(TOPDIR)/rules.mk $(TOPDIR)/.config \
+		$(INCLUDE_DIR) $(SCRIPT_DIR) \
+		$(TOPDIR)/rules.mk \
 		./files/Makefile \
+		./files/repositories.conf \
 		$(TMP_DIR)/.targetinfo \
 		$(TMP_DIR)/.packageinfo \
 		$(PKG_BUILD_DIR)/
-	$(CP) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/
-	$(CP) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/
+	$(CP) ./files/opkg-generate-config.sh $(PKG_BUILD_DIR)/scripts/
+	$(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages
+	$(CP) $(STAGING_DIR_HOST)/bin $(PKG_BUILD_DIR)/staging_dir/host/
 	$(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
 	rm -rf \
-		$(PKG_BUILD_DIR)/target/linux/*/patches \
-		$(PKG_BUILD_DIR)/target/linux/*/*/patches
+		$(PKG_BUILD_DIR)/target/linux/*/files{,-*} \
+		$(PKG_BUILD_DIR)/target/linux/*/patches{,-*}
 	-cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here
-	find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf
-	find $(PKG_BUILD_DIR) -name CVS | $(XARGS) rm -rf
-	find $(PKG_BUILD_DIR) -name .git | $(XARGS) rm -rf
+	echo REVISION:="$(REVISION)" > $(PKG_BUILD_DIR)/include/version.mk
+	find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
+	  | $(XARGS) rm -rf
 	$(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@
 
 download: