From: Jo-Philipp Wich <jo@mein.io>
Date: Sat, 21 Jul 2018 18:47:10 +0000 (+0200)
Subject: build: do not alter global default package selection from profiles
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b84a1c56f3a874c2c3d2b2d8282bc0ad0378d743;p=openwrt%2Fstaging%2Fjow.git

build: do not alter global default package selection from profiles

This partly reverts ca32373c951c651f4fe5d8f99ddeb8d4f20bbe3e which lets
profiles that suppress packages to alter the package selection for all
devices of the target when building with CONFIG_TARGET_PER_DEVICE_ROOTFS.

In particular, this caused the brcm47xx Edimax PS-1208MFG profile to
disable mtd, dropbear, firewall and other essential packages for all
brcm47xx/generic builds.

To solve this problem, prevent profiles from mangling the global
DEFAULT_PACKAGES selection and restrict the supression of negated
packages to the local PACKAGE variable list only.

Fixes ca32373c95 ("target.mk: let profile remove from DEFAULT_PACKAGES")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

(cherry picked from commit 69ea512c62619b8b650d4e03d071b36a526734ce)
---

diff --git a/include/target.mk b/include/target.mk
index a97cda2c3a..0d2ef6a225 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -72,7 +72,6 @@ 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)"; \