X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/3b34d64ca5d74b6687b7e1f57975945de552800e..bea342c4170d26edd420544c8c06a20a0f211906:/target/linux/imagebuilder/Makefile

diff --git a/target/linux/imagebuilder/Makefile b/target/linux/imagebuilder/Makefile
index bff3acf8f..4afb4d45a 100644
--- a/target/linux/imagebuilder/Makefile
+++ b/target/linux/imagebuilder/Makefile
@@ -36,10 +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 -fpR ./files/* $(LINUX_BUILD_DIR)/root; \
+		$(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