diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-15 15:21:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-22 09:16:00 +0100 |
commit | eb40fcf6279478bf53f961f5477fc9e4162dd9a9 (patch) | |
tree | 71f1faf5904a8b8785bcf73b70ae60f679ec0274 /meta/conf | |
parent | 1b489073dcf1e0836f7f2db8cb171debeb7a02e7 (diff) | |
download | poky-eb40fcf6279478bf53f961f5477fc9e4162dd9a9.tar.gz |
meta: Drop remnants of uclibc support
uclibc support was removed a while ago and musl works much better. Start to
remove the various overrides and patches related to uclibc which are no longer
needed.
uclibc support in a layer would still be possible. I have strong reasons to
believe nobody is still using uclibc since patches are missing and I doubt
the metadata even parses anymore.
(From OE-Core rev: 653704e9cf325cb494eb23facca19e9f05132ffd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/include/security_flags.inc | 4 | ||||
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index e162abeb3d..38164d08b8 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc | |||
@@ -84,8 +84,6 @@ SECURITY_CFLAGS_pn-slang = "${SECURITY_NO_PIE_CFLAGS}" | |||
84 | SECURITY_CFLAGS_pn-source-highlight = "${SECURITY_NO_PIE_CFLAGS}" | 84 | SECURITY_CFLAGS_pn-source-highlight = "${SECURITY_NO_PIE_CFLAGS}" |
85 | SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}" | 85 | SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}" |
86 | SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}" | 86 | SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}" |
87 | SECURITY_CFLAGS_pn-uclibc = "" | ||
88 | SECURITY_CFLAGS_pn-uclibc-initial = "" | ||
89 | SECURITY_CFLAGS_pn-valgrind = "" | 87 | SECURITY_CFLAGS_pn-valgrind = "" |
90 | SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}" | 88 | SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}" |
91 | 89 | ||
@@ -100,8 +98,6 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" | |||
100 | SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" | 98 | SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" |
101 | SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" | 99 | SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" |
102 | SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" | 100 | SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" |
103 | SECURITY_LDFLAGS_remove_pn-uclibc = "-fstack-protector-strong" | ||
104 | SECURITY_LDFLAGS_remove_pn-uclibc-initial = "-fstack-protector-strong" | ||
105 | SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" | 101 | SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" |
106 | SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" | 102 | SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" |
107 | SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" | 103 | SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" |
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index d5ba38d442..424b8887cc 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
@@ -27,7 +27,6 @@ SDKGCCVERSION ?= "${GCCVERSION}" | |||
27 | BINUVERSION ?= "2.28%" | 27 | BINUVERSION ?= "2.28%" |
28 | GDBVERSION ?= "8.0%" | 28 | GDBVERSION ?= "8.0%" |
29 | GLIBCVERSION ?= "2.25" | 29 | GLIBCVERSION ?= "2.25" |
30 | UCLIBCVERSION ?= "1.0%" | ||
31 | LINUXLIBCVERSION ?= "4.10%" | 30 | LINUXLIBCVERSION ?= "4.10%" |
32 | 31 | ||
33 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" | 32 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" |
@@ -64,8 +63,6 @@ PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}" | |||
64 | PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}" | 63 | PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}" |
65 | PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}" | 64 | PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}" |
66 | PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" | 65 | PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" |
67 | PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}" | ||
68 | PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}" | ||
69 | # don't use version earlier than 1.4 for gzip-native, as it's necessary for | 66 | # don't use version earlier than 1.4 for gzip-native, as it's necessary for |
70 | # some packages using an archive format incompatible with earlier gzip | 67 | # some packages using an archive format incompatible with earlier gzip |
71 | PREFERRED_VERSION_gzip-native ?= "1.8" | 68 | PREFERRED_VERSION_gzip-native ?= "1.8" |