1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index 4e20a4d0f8..e113f999a1 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -3,14 +3,14 @@
 # or both so a blacklist is maintained here. The idea would be over
 # time to reduce this list to nothing.
 # From a Yocto Project perspective, this file is included and tested
-# in the DISTRO="poky-lsb" configuration.
+# in the DISTRO="poky" configuration.
 GCCPIE ?= "--enable-default-pie"
 # If static PIE is known to work well, GLIBCPIE="--enable-static-pie" can be set
 # _FORTIFY_SOURCE requires -O1 or higher, so disable in debug builds as they use
 # -O0 which then results in a compiler warning.
-lcl_maybe_fortify = "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=2',d)}"
+lcl_maybe_fortify ?= "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=2',d)}"
 # Error on use of format strings that represent possible security problems
 SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security"

diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 4e20a4d0f8..e113f999a1 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc
@@ -3,14 +3,14 @@
3	# or both so a blacklist is maintained here. The idea would be over	3	# or both so a blacklist is maintained here. The idea would be over
4	# time to reduce this list to nothing.	4	# time to reduce this list to nothing.
5	# From a Yocto Project perspective, this file is included and tested	5	# From a Yocto Project perspective, this file is included and tested
6	# in the DISTRO="poky-lsb" configuration.	6	# in the DISTRO="poky" configuration.
7		7
8	GCCPIE ?= "--enable-default-pie"	8	GCCPIE ?= "--enable-default-pie"
9	# If static PIE is known to work well, GLIBCPIE="--enable-static-pie" can be set	9	# If static PIE is known to work well, GLIBCPIE="--enable-static-pie" can be set
10		10
11	# _FORTIFY_SOURCE requires -O1 or higher, so disable in debug builds as they use	11	# _FORTIFY_SOURCE requires -O1 or higher, so disable in debug builds as they use
12	# -O0 which then results in a compiler warning.	12	# -O0 which then results in a compiler warning.
13	lcl_maybe_fortify = "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=2',d)}"	13	lcl_maybe_fortify ?= "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=2',d)}"
14		14
15	# Error on use of format strings that represent possible security problems	15	# Error on use of format strings that represent possible security problems
16	SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security"	16	SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security"