diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2019-09-05 13:44:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-06 08:15:45 +0100 |
commit | 1c115da44666f8ab1e39cd0b20111464b08ed945 (patch) | |
tree | 2707d62ea8736af6cbe4de5905cf95d3386d2464 /meta/conf/distro | |
parent | aaa6e45a286180150e182ba28a3092b6975d3615 (diff) | |
download | poky-1c115da44666f8ab1e39cd0b20111464b08ed945.tar.gz |
Clean up remnants of glibc-initial
Remove remnants of the glibc-initial recipe.
(From OE-Core rev: 332b1e21db3e0cbeeb14f12dd6aeedb89b76d761)
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro')
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/include/security_flags.inc | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 4 |
3 files changed, 0 insertions, 7 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 0757230b1a..3bc22c6156 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -215,7 +215,6 @@ RECIPE_MAINTAINER_pn-glew = "Anuj Mittal <anuj.mittal@intel.com>" | |||
215 | RECIPE_MAINTAINER_pn-glib-2.0 = "Anuj Mittal <anuj.mittal@intel.com>" | 215 | RECIPE_MAINTAINER_pn-glib-2.0 = "Anuj Mittal <anuj.mittal@intel.com>" |
216 | RECIPE_MAINTAINER_pn-glib-networking = "Anuj Mittal <anuj.mittal@intel.com>" | 216 | RECIPE_MAINTAINER_pn-glib-networking = "Anuj Mittal <anuj.mittal@intel.com>" |
217 | RECIPE_MAINTAINER_pn-glibc = "Khem Raj <raj.khem@gmail.com>" | 217 | RECIPE_MAINTAINER_pn-glibc = "Khem Raj <raj.khem@gmail.com>" |
218 | RECIPE_MAINTAINER_pn-glibc-initial = "Khem Raj <raj.khem@gmail.com>" | ||
219 | RECIPE_MAINTAINER_pn-glibc-locale = "Khem Raj <raj.khem@gmail.com>" | 218 | RECIPE_MAINTAINER_pn-glibc-locale = "Khem Raj <raj.khem@gmail.com>" |
220 | RECIPE_MAINTAINER_pn-glibc-mtrace = "Khem Raj <raj.khem@gmail.com>" | 219 | RECIPE_MAINTAINER_pn-glibc-mtrace = "Khem Raj <raj.khem@gmail.com>" |
221 | RECIPE_MAINTAINER_pn-glibc-scripts = "Khem Raj <raj.khem@gmail.com>" | 220 | RECIPE_MAINTAINER_pn-glibc-scripts = "Khem Raj <raj.khem@gmail.com>" |
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 620978a8ed..758bd89c3e 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc | |||
@@ -36,7 +36,6 @@ SECURITY_CFLAGS_remove_powerpc = "${SECURITY_PIE_CFLAGS}" | |||
36 | SECURITY_CFLAGS_pn-libgcc_powerpc = "" | 36 | SECURITY_CFLAGS_pn-libgcc_powerpc = "" |
37 | 37 | ||
38 | SECURITY_CFLAGS_pn-glibc = "" | 38 | SECURITY_CFLAGS_pn-glibc = "" |
39 | SECURITY_CFLAGS_pn-glibc-initial = "" | ||
40 | SECURITY_CFLAGS_pn-gcc-runtime = "" | 39 | SECURITY_CFLAGS_pn-gcc-runtime = "" |
41 | SECURITY_CFLAGS_pn-grub = "" | 40 | SECURITY_CFLAGS_pn-grub = "" |
42 | SECURITY_CFLAGS_pn-grub-efi = "" | 41 | SECURITY_CFLAGS_pn-grub-efi = "" |
@@ -60,7 +59,6 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" | |||
60 | 59 | ||
61 | SECURITY_STACK_PROTECTOR_pn-gcc-runtime = "" | 60 | SECURITY_STACK_PROTECTOR_pn-gcc-runtime = "" |
62 | SECURITY_STACK_PROTECTOR_pn-glibc = "" | 61 | SECURITY_STACK_PROTECTOR_pn-glibc = "" |
63 | SECURITY_STACK_PROTECTOR_pn-glibc-initial = "" | ||
64 | # All xorg module drivers need to be linked this way as well and are | 62 | # All xorg module drivers need to be linked this way as well and are |
65 | # handled in recipes-graphics/xorg-driver/xorg-driver-common.inc | 63 | # handled in recipes-graphics/xorg-driver/xorg-driver-common.inc |
66 | SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" | 64 | SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" |
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 5c28386c4f..d8f434609b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
@@ -14,8 +14,6 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_SYS}" | |||
14 | PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" | 14 | PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" |
15 | 15 | ||
16 | # Default libc config | 16 | # Default libc config |
17 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial" | ||
18 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial ?= "nativesdk-glibc-initial" | ||
19 | PREFERRED_PROVIDER_virtual/gettext ??= "gettext" | 17 | PREFERRED_PROVIDER_virtual/gettext ??= "gettext" |
20 | 18 | ||
21 | GCCVERSION ?= "9.%" | 19 | GCCVERSION ?= "9.%" |
@@ -62,8 +60,6 @@ PREFERRED_VERSION_glibc-locale ?= "${GLIBCVERSION}" | |||
62 | PREFERRED_VERSION_glibc-mtrace ?= "${GLIBCVERSION}" | 60 | PREFERRED_VERSION_glibc-mtrace ?= "${GLIBCVERSION}" |
63 | PREFERRED_VERSION_glibc-scripts ?= "${GLIBCVERSION}" | 61 | PREFERRED_VERSION_glibc-scripts ?= "${GLIBCVERSION}" |
64 | PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}" | 62 | PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}" |
65 | PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}" | ||
66 | PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}" | ||
67 | PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" | 63 | PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" |
68 | 64 | ||
69 | PREFERRED_VERSION_qemu ?= "${QEMUVERSION}" | 65 | PREFERRED_VERSION_qemu ?= "${QEMUVERSION}" |