[openwrt/openwrt] target.mk: let profile remove from DEFAULT_PACKAGES

LEDE Commits lede-commits at lists.infradead.org
Tue Feb 13 04:13:11 PST 2018


blogic pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/ca32373c951c651f4fe5d8f99ddeb8d4f20bbe3e

commit ca32373c951c651f4fe5d8f99ddeb8d4f20bbe3e
Author: Philip Prindeville <philipp at redfish-solutions.com>
AuthorDate: Tue Jan 16 15:46:44 2018 -0700

    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 at redfish-solutions.com>
---
 include/target.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/target.mk b/include/target.mk
index 8ee197f..b844689 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)"; ) \



More information about the lede-commits mailing list