diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/conf')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/conf/distro/include/meta_oe_security_flags.inc | 28 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/conf/layer.conf | 8 |
2 files changed, 1 insertions, 35 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/conf/distro/include/meta_oe_security_flags.inc b/import-layers/meta-openembedded/meta-oe/conf/distro/include/meta_oe_security_flags.inc deleted file mode 100644 index 03868bfaf..000000000 --- a/import-layers/meta-openembedded/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/import-layers/meta-openembedded/meta-oe/conf/layer.conf b/import-layers/meta-openembedded/meta-oe/conf/layer.conf index 54425c68e..d84bd09d3 100644 --- a/import-layers/meta-openembedded/meta-oe/conf/layer.conf +++ b/import-layers/meta-openembedded/meta-oe/conf/layer.conf @@ -41,6 +41,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ " SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ + android-tools->android-tools-conf \ usb-modeswitch-data->usb-modeswitch \ lmsensors->lmsensors-config \ phoronix-test-suite->bash \ @@ -74,10 +75,3 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ source-han-sans-kr-fonts->fontconfig \ source-han-sans-tw-fonts->fontconfig \ " - -FREESMARTPHONE_GIT = "git://git.freesmartphone.org" - -# Override security flags -require conf/distro/include/meta_oe_security_flags.inc - -HOSTTOOLS += "id" |