X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8d627f3fc5b90bd3b2349888ec5eefbf3778da41..3d5f824ebe8661e267e0636de19c83e61047ed6e:/openwrt/target/linux/imagebuilder/Makefile?ds=sidebyside diff --git a/openwrt/target/linux/imagebuilder/Makefile b/openwrt/target/linux/imagebuilder/Makefile index 8da50bdd7..8ed7a5cc0 100644 --- a/openwrt/target/linux/imagebuilder/Makefile +++ b/openwrt/target/linux/imagebuilder/Makefile @@ -36,7 +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) --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