summaryrefslogtreecommitdiffstats
path: root/meta-networking/conf
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-07-08 06:17:41 -0700
committerJoe MacDonald <joe_macdonald@mentor.com>2017-09-08 16:38:12 -0400
commit39731d843df6b45d3512f5c832c23b7ac231c945 (patch)
treef4e79a56a2b2ce167c4b8de1adbfb722c3acfee2 /meta-networking/conf
parentee8e9b85c0a315bfc42d538b955bc326992a1374 (diff)
downloadmeta-openembedded-39731d843df6b45d3512f5c832c23b7ac231c945.tar.gz
security_flags.inc: Delete
OE-Core has now reworked the PIE flags, where they are implicitly passed by compiler when security flags are enabled None of these pinnings are needed anymore, since these packages compile fine with security flags enabled Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/conf')
-rw-r--r--meta-networking/conf/distro/include/meta_networking_security_flags.inc10
-rw-r--r--meta-networking/conf/layer.conf3
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
8lcl_maybe_fortify ?= ""
9TARGET_CFLAGS_remove_pn-c-ares = "${lcl_maybe_fortify}"
10TARGET_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
20LICENSE_PATH += "${LAYERDIR}/licenses" 20LICENSE_PATH += "${LAYERDIR}/licenses"
21 21
22# Override security flags
23require conf/distro/include/meta_networking_security_flags.inc
24
25SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ 22SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
26 wireguard-tools->wireguard-module \ 23 wireguard-tools->wireguard-module \
27" 24"