From: Philip Prindeville <philipp@redfish-solutions.com>
Date: Tue, 16 Jan 2018 22:46:44 +0000 (-0700)
Subject: target.mk: let profile remove from DEFAULT_PACKAGES
X-Git-Tag: v18.06.0-rc1~963
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca32373c95;p=oweals%2Fopenwrt.git

target.mk: let profile remove from DEFAULT_PACKAGES

In a profile, specifying -pkg in the list of PACKAGES will suppress
it even if it appears in the target's DEFAULT_PACKAGES list.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
---

diff --git a/include/target.mk b/include/target.mk
index 8ee197f1c4..b84468997a 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -68,6 +68,8 @@ define Profile
   $(eval $(call ProfileDefault))
   $(eval $(call Profile/$(1)))
   dumpinfo : $(call shexport,Profile/$(1)/Description)
+  DEFAULT_PACKAGES := $(filter-out $(patsubst -%,%,$(filter -%,$(PACKAGES))),$(DEFAULT_PACKAGES))
+  PACKAGES := $(filter-out -%,$(PACKAGES))
   DUMPINFO += \
 	echo "Target-Profile: $(1)"; \
 	$(if $(PRIORITY), echo "Target-Profile-Priority: $(PRIORITY)"; ) \