aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/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-oe/conf
parentee8e9b85c0a315bfc42d538b955bc326992a1374 (diff)
downloadmeta-openembedded-contrib-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-oe/conf')
-rw-r--r--meta-oe/conf/distro/include/meta_oe_security_flags.inc28
-rw-r--r--meta-oe/conf/layer.conf3
2 files changed, 0 insertions, 31 deletions
diff --git a/meta-oe/conf/distro/include/meta_oe_security_flags.inc b/meta-oe/conf/distro/include/meta_oe_security_flags.inc
deleted file mode 100644
index 03868bfaf5..0000000000
--- a/meta-oe/conf/distro/include/meta_oe_security_flags.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-# Build errors with the pie options enabled
-SECURITY_CFLAGS_pn-libdbus-c++ = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-libdevmapper = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-lvm2 = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-rrdtool = "${SECURITY_NO_PIE_CFLAGS}"
-
-# This has text reloc errors with the pie options enabled
-SECURITY_CFLAGS_pn-llvm3.3 = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-mozjs = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-openldap = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-s3c64xx-gpio = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-s3c24xx-gpio = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-cpufrequtils = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-libcec = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-libmodplug = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-libcdio = "${SECURITY_NO_PIE_CFLAGS}"
-
-#| /mnt/b/build/tmp-glibc/sysroots/intel-corei7-64/usr/lib/libc_nonshared.a(elf-init.oS): In function `__libc_csu_init':
-#| /usr/src/debug/glibc/2.24-r0/git/csu/elf-init.c:86: undefined reference to `__init_array_start'
-
-SECURITY_CFLAGS_pn-libvdpau = "${SECURITY_NO_PIE_CFLAGS}"
-
-#| /mnt/a/build/tmp-glibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/6.2.0/ld: lj_err_dyn.o: relocation R_X86_64_TPOFF32 against `static_uex' can not be used when making a shared object; recompile with -fPIC
-#| /mnt/a/build/tmp-glibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/6.2.0/ld: final link failed: Nonrepresentable section on output
-#| collect2: error: ld returned 1 exit status
-#| make[1]: *** [Makefile:675: libluajit.so] Error 1
-SECURITY_CFLAGS_pn-luajit = "${SECURITY_NO_PIE_CFLAGS}"
-
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index 868ed4e4f6..3896ff7f06 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -76,7 +76,4 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
source-han-sans-tw-fonts->fontconfig \
"
-# Override security flags
-require conf/distro/include/meta_oe_security_flags.inc
-
HOSTTOOLS += "id"