summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2019-09-05 13:44:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-06 08:15:45 +0100
commit1c115da44666f8ab1e39cd0b20111464b08ed945 (patch)
tree2707d62ea8736af6cbe4de5905cf95d3386d2464 /meta/conf/distro
parentaaa6e45a286180150e182ba28a3092b6975d3615 (diff)
downloadpoky-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.inc1
-rw-r--r--meta/conf/distro/include/security_flags.inc2
-rw-r--r--meta/conf/distro/include/tcmode-default.inc4
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>"
215RECIPE_MAINTAINER_pn-glib-2.0 = "Anuj Mittal <anuj.mittal@intel.com>" 215RECIPE_MAINTAINER_pn-glib-2.0 = "Anuj Mittal <anuj.mittal@intel.com>"
216RECIPE_MAINTAINER_pn-glib-networking = "Anuj Mittal <anuj.mittal@intel.com>" 216RECIPE_MAINTAINER_pn-glib-networking = "Anuj Mittal <anuj.mittal@intel.com>"
217RECIPE_MAINTAINER_pn-glibc = "Khem Raj <raj.khem@gmail.com>" 217RECIPE_MAINTAINER_pn-glibc = "Khem Raj <raj.khem@gmail.com>"
218RECIPE_MAINTAINER_pn-glibc-initial = "Khem Raj <raj.khem@gmail.com>"
219RECIPE_MAINTAINER_pn-glibc-locale = "Khem Raj <raj.khem@gmail.com>" 218RECIPE_MAINTAINER_pn-glibc-locale = "Khem Raj <raj.khem@gmail.com>"
220RECIPE_MAINTAINER_pn-glibc-mtrace = "Khem Raj <raj.khem@gmail.com>" 219RECIPE_MAINTAINER_pn-glibc-mtrace = "Khem Raj <raj.khem@gmail.com>"
221RECIPE_MAINTAINER_pn-glibc-scripts = "Khem Raj <raj.khem@gmail.com>" 220RECIPE_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}"
36SECURITY_CFLAGS_pn-libgcc_powerpc = "" 36SECURITY_CFLAGS_pn-libgcc_powerpc = ""
37 37
38SECURITY_CFLAGS_pn-glibc = "" 38SECURITY_CFLAGS_pn-glibc = ""
39SECURITY_CFLAGS_pn-glibc-initial = ""
40SECURITY_CFLAGS_pn-gcc-runtime = "" 39SECURITY_CFLAGS_pn-gcc-runtime = ""
41SECURITY_CFLAGS_pn-grub = "" 40SECURITY_CFLAGS_pn-grub = ""
42SECURITY_CFLAGS_pn-grub-efi = "" 41SECURITY_CFLAGS_pn-grub-efi = ""
@@ -60,7 +59,6 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}"
60 59
61SECURITY_STACK_PROTECTOR_pn-gcc-runtime = "" 60SECURITY_STACK_PROTECTOR_pn-gcc-runtime = ""
62SECURITY_STACK_PROTECTOR_pn-glibc = "" 61SECURITY_STACK_PROTECTOR_pn-glibc = ""
63SECURITY_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
66SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" 64SECURITY_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}"
14PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" 14PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime"
15 15
16# Default libc config 16# Default libc config
17PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
18PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial ?= "nativesdk-glibc-initial"
19PREFERRED_PROVIDER_virtual/gettext ??= "gettext" 17PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
20 18
21GCCVERSION ?= "9.%" 19GCCVERSION ?= "9.%"
@@ -62,8 +60,6 @@ PREFERRED_VERSION_glibc-locale ?= "${GLIBCVERSION}"
62PREFERRED_VERSION_glibc-mtrace ?= "${GLIBCVERSION}" 60PREFERRED_VERSION_glibc-mtrace ?= "${GLIBCVERSION}"
63PREFERRED_VERSION_glibc-scripts ?= "${GLIBCVERSION}" 61PREFERRED_VERSION_glibc-scripts ?= "${GLIBCVERSION}"
64PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}" 62PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}"
65PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}"
66PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}"
67PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" 63PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}"
68 64
69PREFERRED_VERSION_qemu ?= "${QEMUVERSION}" 65PREFERRED_VERSION_qemu ?= "${QEMUVERSION}"