X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=target%2Fimagebuilder%2Ffiles%2FMakefile;h=8b386a33c6c6e49f89bb4f7a5569e66f1db4d445;hp=fbcfa0d49aa5a2a795f733483891ddb802fb8dbf;hb=a91b3a746d48069d4db5b94d1d59eaa2759b5f28;hpb=9a4d3ef3e0b28c368223b5134c718573871ccc4f diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index fbcfa0d49..8b386a33c 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -34,10 +34,11 @@ IPKG:= \ define Profile/Default ID:= NAME:= + KCONFIG:= PACKAGES:= endef -define Profile +define AddProfile $(eval $(call Profile/Default)) $(eval $(call Profile/$(1))) ifneq ($(ID),) @@ -46,8 +47,10 @@ define Profile endif $(ID)_NAME:=$(NAME) $(ID)_PACKAGES:=$(PACKAGES) - PROFILE_LIST += \ + ifneq ($(KCONFIG),) + PROFILE_LIST += \ echo '$(ID):'; [ -z '$(NAME)' ] || echo ' $(NAME)'; echo ' Packages: $(PACKAGES)'; + endif endif endef @@ -87,6 +90,8 @@ $(TOPDIR)/tmp/ipkg.conf: FORCE BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel) BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD)-$(KERNEL),$(BUILD_PACKAGES)) +# "-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 \