diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2015-06-12 15:17:34 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-23 11:46:56 +0100 |
| commit | de18f7595f4f96ee78c1d2839f8be4d160a07ba3 (patch) | |
| tree | c96c63af46fbc4a6c64004c0bbb47047601362eb | |
| parent | 8ef99a00dc75c6eed87aa1bc1528614a2a27eddf (diff) | |
| download | poky-de18f7595f4f96ee78c1d2839f8be4d160a07ba3.tar.gz | |
security_flags.inc: remove duplicated over-rides
The following over-rides were both defined twice:
SECURITY_CFLAGS_pn-grub-efi-x86-64-native
SECURITY_CFLAGS_pn-ltp
(From OE-Core rev: dfae10889ab0fce2bae94294a78f4ea0aaf1b81e)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/distro/include/security_flags.inc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 9608c7f069..104a6cbfea 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc | |||
| @@ -47,7 +47,6 @@ SECURITY_CFLAGS_pn-grub = "" | |||
| 47 | SECURITY_CFLAGS_pn-grub-efi = "" | 47 | SECURITY_CFLAGS_pn-grub-efi = "" |
| 48 | SECURITY_CFLAGS_pn-grub-efi-native = "" | 48 | SECURITY_CFLAGS_pn-grub-efi-native = "" |
| 49 | SECURITY_CFLAGS_pn-grub-efi-x86-native = "" | 49 | SECURITY_CFLAGS_pn-grub-efi-x86-native = "" |
| 50 | SECURITY_CFLAGS_pn-grub-efi-x86-64-native = "" | ||
| 51 | SECURITY_CFLAGS_pn-grub-efi-i586-native = "" | 50 | SECURITY_CFLAGS_pn-grub-efi-i586-native = "" |
| 52 | SECURITY_CFLAGS_pn-grub-efi-x86-64-native = "" | 51 | SECURITY_CFLAGS_pn-grub-efi-x86-64-native = "" |
| 53 | SECURITY_CFLAGS_pn-gst-plugins-bad = "${SECURITY_NO_PIE_CFLAGS}" | 52 | SECURITY_CFLAGS_pn-gst-plugins-bad = "${SECURITY_NO_PIE_CFLAGS}" |
| @@ -65,7 +64,6 @@ SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" | |||
| 65 | SECURITY_CFLAGS_pn-libpcap = "${SECURITY_NO_PIE_CFLAGS}" | 64 | SECURITY_CFLAGS_pn-libpcap = "${SECURITY_NO_PIE_CFLAGS}" |
| 66 | SECURITY_CFLAGS_pn-libpcre = "${SECURITY_NO_PIE_CFLAGS}" | 65 | SECURITY_CFLAGS_pn-libpcre = "${SECURITY_NO_PIE_CFLAGS}" |
| 67 | SECURITY_CFLAGS_pn-libproxy = "${SECURITY_NO_PIE_CFLAGS}" | 66 | SECURITY_CFLAGS_pn-libproxy = "${SECURITY_NO_PIE_CFLAGS}" |
| 68 | SECURITY_CFLAGS_pn-ltp = "${SECURITY_NO_PIE_CFLAGS}" | ||
| 69 | SECURITY_CFLAGS_pn-lttng-ust = "${SECURITY_NO_PIE_CFLAGS}" | 67 | SECURITY_CFLAGS_pn-lttng-ust = "${SECURITY_NO_PIE_CFLAGS}" |
| 70 | SECURITY_CFLAGS_pn-mesa = "${SECURITY_NO_PIE_CFLAGS}" | 68 | SECURITY_CFLAGS_pn-mesa = "${SECURITY_NO_PIE_CFLAGS}" |
| 71 | SECURITY_CFLAGS_pn-mesa-gl = "${SECURITY_NO_PIE_CFLAGS}" | 69 | SECURITY_CFLAGS_pn-mesa-gl = "${SECURITY_NO_PIE_CFLAGS}" |