diff options
Diffstat (limited to 'meta-networking/conf')
-rw-r--r-- | meta-networking/conf/distro/include/meta_networking_security_flags.inc | 10 | ||||
-rw-r--r-- | meta-networking/conf/layer.conf | 3 |
2 files changed, 0 insertions, 13 deletions
diff --git a/meta-networking/conf/distro/include/meta_networking_security_flags.inc b/meta-networking/conf/distro/include/meta_networking_security_flags.inc deleted file mode 100644 index 19e13ea87..000000000 --- a/meta-networking/conf/distro/include/meta_networking_security_flags.inc +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | # configure righteously complains: | ||
2 | # | configure:3479: using CFLAGS: -O2 -pipe -g -feliminate-unused-debug-types -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 | ||
3 | # | configure:3485: CFLAGS error: CFLAGS may only be used to specify C compiler flags, not macro definitions. Use CPPFLAGS for: -D_FORTIFY_SOURCE=2 | ||
4 | # | configure:3516: error: Can not continue. Fix errors mentioned immediately above this line. | ||
5 | |||
6 | # Make sure it's at least empty in builds which don't include | ||
7 | # conf/distro/include/security_flags.inc | ||
8 | lcl_maybe_fortify ?= "" | ||
9 | TARGET_CFLAGS_remove_pn-c-ares = "${lcl_maybe_fortify}" | ||
10 | TARGET_CPPFLAGS_append_pn-c-ares = "${lcl_maybe_fortify}" | ||
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index b5aa1599b..2dfde4bdf 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf | |||
@@ -19,9 +19,6 @@ LAYERDEPENDS_networking-layer += "meta-python" | |||
19 | 19 | ||
20 | LICENSE_PATH += "${LAYERDIR}/licenses" | 20 | LICENSE_PATH += "${LAYERDIR}/licenses" |
21 | 21 | ||
22 | # Override security flags | ||
23 | require conf/distro/include/meta_networking_security_flags.inc | ||
24 | |||
25 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | 22 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ |
26 | wireguard-tools->wireguard-module \ | 23 | wireguard-tools->wireguard-module \ |
27 | " | 24 | " |