X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=openwrt%2Ftarget%2Flinux%2Fimagebuilder%2FMakefile;h=4afb4d45a750e0095fb4eec2058c24b548e7d105;hp=8da50bdd78f71f136706f2bfd1c6945891015aa7;hb=873b6cd417c85034eea08799ff49061866807781;hpb=8af1a455b370795c53e243d261fe2c1629cf5101

diff --git a/openwrt/target/linux/imagebuilder/Makefile b/openwrt/target/linux/imagebuilder/Makefile
index 8da50bdd78..4afb4d45a7 100644
--- a/openwrt/target/linux/imagebuilder/Makefile
+++ b/openwrt/target/linux/imagebuilder/Makefile
@@ -36,7 +36,14 @@ build:
 	mkdir -p $(LINUX_BUILD_DIR)/root
 	echo -e 'dest root /\noption offline_root $(LINUX_BUILD_DIR)/root' > $(LINUX_BUILD_DIR)/ipkg.conf
 	$(IPKG_KERNEL) install $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk
-	for package in `cat lists/$(LIST).$(BOARD)-$(KERNEL)`; do \
+	for package in `grep -v '^#' lists/$(LIST).$(BOARD)-$(KERNEL)`; do \
 		$(IPKG_KERNEL) install `ls packages/$${package}_*`; \
 	done
+	if [ -d ./files ]; then \
+		$(CP) --remove-destination ./files/* $(LINUX_BUILD_DIR)/root; \
+	fi
+	if [ -d ./files.$(LIST) ]; then \
+		$(CP) --remove-destination ./files.$(LIST)/* $(LINUX_BUILD_DIR)/root; \
+	fi
+	find $(LINUX_BUILD_DIR)/root -name '.svn' || 'CVS' | xargs rm -rf
 	$(MAKE) -S -C image KERNEL="$(KERNEL)" BOARD="$(BOARD)" BIN_DIR="$(BIN_DIR)/$(LIST)" install