rules: share the wrapper blacklist for all low-level packages

This should really be the same anyways and some packages tend to be
forgotten when new options appear. So use one variable for all.
This adds missing options, e.g. for the kernel template.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

11 files changed, 23 insertions, 67 deletions

diff --git a/rules/at91bootstrap.make b/rules/at91bootstrap.make
index de169c590..9a5e50fdf 100644
--- a/rules/at91bootstrap.make
+++ b/rules/at91bootstrap.make
@@ -35,13 +35,7 @@ AT91BOOTSTRAP_LICENSE_FILES := \
 # ----------------------------------------------------------------------------
 
 AT91BOOTSTRAP_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_STACK \
-	TARGET_HARDEN_STACKCLASH \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 AT91BOOTSTRAP_BOOTMEDIA-$(PTXCONF_AT91BOOTSTRAP_BOOT_DATAFLASH)	+= dataflash
 AT91BOOTSTRAP_BOOTMEDIA-$(PTXCONF_AT91BOOTSTRAP_BOOT_NAND)	+= nandflash
diff --git a/rules/at91bootstrap2.make b/rules/at91bootstrap2.make
index 1f44fb314..dcceb17cf 100644
--- a/rules/at91bootstrap2.make
+++ b/rules/at91bootstrap2.make
@@ -30,12 +30,7 @@ AT91BOOTSTRAP2_LICENSE	:= unknown
 # ----------------------------------------------------------------------------
 
 AT91BOOTSTRAP2_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_STACKCLASH \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 AT91BOOTSTRAP2_MAKE_OPT := \
 	HOSTCC=$(HOSTCC) \
diff --git a/rules/barebox.make b/rules/barebox.make
index 7a72e0a7f..c7449c4de 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -38,12 +38,7 @@ BAREBOX_CONFIG		:= $(call ptx/in-platformconfigdir, \
 BAREBOX_PATH := PATH=$(HOST_PATH)
 
 BAREBOX_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_STACKCLASH \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 BAREBOX_CONF_OPT := \
 	-C $(BAREBOX_DIR) \
diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make
index 6bf05902a..e7ddc4f07 100644
--- a/rules/barebox_mlo.make
+++ b/rules/barebox_mlo.make
@@ -31,12 +31,7 @@ BAREBOX_MLO_CONFIG	:= $(call ptx/in-platformconfigdir, \
 # ----------------------------------------------------------------------------
 
 BAREBOX_MLO_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_STACKCLASH \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 BAREBOX_MLO_PATH	:= PATH=$(CROSS_PATH)
 BAREBOX_MLO_CONF_ENV	:= KCONFIG_NOTIMESTAMP=1
diff --git a/rules/grub.make b/rules/grub.make
index 32d01823e..8f01a7fca 100644
--- a/rules/grub.make
+++ b/rules/grub.make
@@ -35,14 +35,7 @@ GRUB_ENV	:= $(CROSS_ENV) CFLAGS=''
 GRUB_CFLAGS	:= -fgnu89-inline
 
 GRUB_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_STACK \
-	TARGET_HARDEN_STACKCLASH \
-	TARGET_HARDEN_FORTIFY \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 GRUB_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
diff --git a/rules/kernel.make b/rules/kernel.make
index 218c61d62..2dc811444 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -38,14 +38,7 @@ KERNEL_BUILD_OOT	:= KEEP
 
 # use CONFIG_CC_STACKPROTECTOR if available. The rest makes no sense for the kernel
 KERNEL_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_STACK \
-	TARGET_HARDEN_STACKCLASH \
-	TARGET_HARDEN_FORTIFY \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 # check for old kernel modules rules
 KERNEL_MAKEVARS = -C KERNEL_MAKEVARS-was-renamed-to-KERNEL_MAKE_OPT
diff --git a/rules/optee.make b/rules/optee.make
index 56ec350da..4d9913143 100644
--- a/rules/optee.make
+++ b/rules/optee.make
@@ -31,13 +31,7 @@ OPTEE_DEVPKG	:= NO
 # ----------------------------------------------------------------------------
 
 OPTEE_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_STACKCLASH \
-	TARGET_HARDEN_FORTIFY \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 OPTEE_CONF_TOOL := NO
 OPTEE_MAKE_ENV += \
diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make
index fcf9c5566..eb36b0912 100644
--- a/rules/pre/kernel.make
+++ b/rules/pre/kernel.make
@@ -74,6 +74,19 @@ kernel-opts = \
 	$(call kernel/opts,$(strip $(1)))
 
 #
+# Blacklist for all low-level code, e.g. kernel and bootloaders
+#
+PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST := \
+	TARGET_HARDEN_STACK \
+	TARGET_HARDEN_STACKCLASH \
+	TARGET_HARDEN_FORTIFY \
+	TARGET_HARDEN_RELRO \
+	TARGET_HARDEN_BINDNOW \
+	TARGET_HARDEN_PIE \
+	TARGET_DEBUG \
+	TARGET_BUILD_ID
+
+#
 # handle special compiler
 #
 ifdef PTXCONF_KERNEL
diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
index fb4dcf170..414c7826b 100644
--- a/rules/templates/template-barebox-make
+++ b/rules/templates/template-barebox-make
@@ -34,12 +34,7 @@ BAREBOX_@PACKAGE@_BUILD_OOT	:= KEEP
 BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
 
 BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_STACKCLASH \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 BAREBOX_@PACKAGE@_CONF_OPT := \
 	-C $(BAREBOX_@PACKAGE@_DIR) \
diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
index 8aac072c4..23dfa0c84 100644
--- a/rules/templates/template-kernel-make
+++ b/rules/templates/template-kernel-make
@@ -30,13 +30,7 @@ KERNEL_@PACKAGE@_SOURCE		:= $(SRCDIR)/$(KERNEL_@PACKAGE@).$(KERNEL_@PACKAGE@_SUF
 
 # use CONFIG_CC_STACKPROTECTOR if available. The rest makes no sense for the kernel
 KERNEL_@PACKAGE@_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_STACKCLASH \
-	TARGET_HARDEN_STACK \
-	TARGET_HARDEN_FORTIFY \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 KERNEL_@PACKAGE@_PATH		:= PATH=$(CROSS_PATH)
 KERNEL_@PACKAGE@_ENV		:= KCONFIG_NOTIMESTAMP=1
diff --git a/rules/u-boot.make b/rules/u-boot.make
index abb9f842f..8f9290ea7 100644
--- a/rules/u-boot.make
+++ b/rules/u-boot.make
@@ -42,12 +42,7 @@ $(STATEDIR)/u-boot.compile: $(U_BOOT_BOOT_SCRIPT_TXT)
 endif
 
 U_BOOT_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_STACKCLASH \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 U_BOOT_MAKE_ENV		:= \
 	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \