X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/76fb3b55c9f0c0759a56605ecdd34200d811e8b1..df67b629403e12e1169f710706b25c8ca4c3abcf:/target/imagebuilder/files/Makefile diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 859cfcb7b..f73642b6a 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -81,18 +81,12 @@ $(TOPDIR)/tmp/ipkg.conf: FORCE @echo 'dest root /' > $@ @echo 'src packages file:$(PACKAGE_DIR)' >> $@ -BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $($(PROFILE)_PACKAGES) kernel) -BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD),$(BUILD_PACKAGES)) +BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel) # "-pkgname" in the package list means remove "pkgname" from the package list BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES)) image: - if [ -z "$($(PROFILE)_NAME)" ]; then \ - echo Profile $(PROFILE) not found.; \ - echo 'Use "make info" to get a list of available target profiles'; \ - false; \ - fi - echo 'Building images for $(BOARD) - $($(PROFILE)_NAME)' + echo 'Building images for $(BOARD)$(if $($(PROFILE)_NAME), - $($(PROFILE)_NAME))' echo 'Packages: $(BUILD_PACKAGES)' echo rm -rf $(TARGET_DIR)