X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d98b072fe5150f6ec55d1d7d191f28216bbdb226..b2af81841f59dee044c98a808b3c001bcd701854:/openwrt/target/linux/imagebuilder/Makefile?ds=sidebyside

diff --git a/openwrt/target/linux/imagebuilder/Makefile b/openwrt/target/linux/imagebuilder/Makefile
index bff3acf8f..8ed7a5cc0 100644
--- a/openwrt/target/linux/imagebuilder/Makefile
+++ b/openwrt/target/linux/imagebuilder/Makefile
@@ -36,10 +36,13 @@ 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
 	$(MAKE) -S -C image KERNEL="$(KERNEL)" BOARD="$(BOARD)" BIN_DIR="$(BIN_DIR)/$(LIST)" install