X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/72ee8bf58afa4f371d49c5220834215e7603e8f7..2932783cf5c4f413594f68e4bdcb6e2e3aec0ada:/openwrt/target/linux/imagebuilder/Makefile diff --git a/openwrt/target/linux/imagebuilder/Makefile b/openwrt/target/linux/imagebuilder/Makefile index f097e89e6..0ec71199c 100644 --- a/openwrt/target/linux/imagebuilder/Makefile +++ b/openwrt/target/linux/imagebuilder/Makefile @@ -36,13 +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 -a --remove-destination ./files/* $(LINUX_BUILD_DIR)/root; \ fi - if [ -d ./files.$(BOARD) ]; then \ - cp -fpR ./files.$(BOARD)/* $(LINUX_BUILD_DIR)/root; \ + if [ -d ./files.$(LIST) ]; then \ + cp -a --remove-destination ./files.$(LIST)/* $(LINUX_BUILD_DIR)/root; \ fi $(MAKE) -S -C image KERNEL="$(KERNEL)" BOARD="$(BOARD)" BIN_DIR="$(BIN_DIR)/$(LIST)" install