summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-15 15:21:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-22 09:16:00 +0100
commiteb40fcf6279478bf53f961f5477fc9e4162dd9a9 (patch)
tree71f1faf5904a8b8785bcf73b70ae60f679ec0274 /meta/recipes-core
parent1b489073dcf1e0836f7f2db8cb171debeb7a02e7 (diff)
downloadpoky-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/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox.inc2
-rw-r--r--meta/recipes-core/gettext/gettext_0.19.8.1.bb8
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc1
-rw-r--r--meta/recipes-core/glibc/glibc-collateral.inc1
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc16
-rw-r--r--meta/recipes-core/glibc/glibc_2.25.bb1
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-sdk.bb1
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb13
-rw-r--r--meta/recipes-core/systemd/systemd.inc2
-rw-r--r--meta/recipes-core/systemd/systemd_232.bb3
10 files changed, 3 insertions, 45 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 0816df624a..b8edd3942c 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -71,7 +71,7 @@ def features_to_busybox_settings(d):
71 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) 71 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem)
72 return "\n".join(cnf), "\n".join(rem) 72 return "\n".join(cnf), "\n".join(rem)
73 73
74# X, Y = ${@features_to_uclibc_settings(d)} 74# X, Y = ${@features_to_busybox_settings(d)}
75# unfortunately doesn't seem to work with bitbake, workaround: 75# unfortunately doesn't seem to work with bitbake, workaround:
76def features_to_busybox_conf(d): 76def features_to_busybox_conf(d):
77 cnf, rem = features_to_busybox_settings(d) 77 cnf, rem = features_to_busybox_settings(d)
diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
index 83edffe530..97e7986dc1 100644
--- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
@@ -24,8 +24,6 @@ SRC_URI[sha256sum] = "ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c
24 24
25PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses," 25PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"
26 26
27LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread "
28
29inherit autotools texinfo 27inherit autotools texinfo
30 28
31EXTRA_OECONF += "--without-lispdir \ 29EXTRA_OECONF += "--without-lispdir \
@@ -86,15 +84,9 @@ FILES_gettext-runtime = "${bindir}/gettext \
86 ${libdir}/libasprintf.so* \ 84 ${libdir}/libasprintf.so* \
87 ${libdir}/GNU.Gettext.dll \ 85 ${libdir}/GNU.Gettext.dll \
88 " 86 "
89FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so.* \
90 ${libdir}/charset.alias \
91 "
92FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ 87FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \
93 ${includedir}/autosprintf.h \ 88 ${includedir}/autosprintf.h \
94 " 89 "
95FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.so \
96 ${includedir}/libintl.h \
97 "
98FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ 90FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \
99 ${mandir}/man1/ngettext.* \ 91 ${mandir}/man1/ngettext.* \
100 ${mandir}/man1/envsubst.* \ 92 ${mandir}/man1/envsubst.* \
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 2caa341869..4a145ae69c 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -43,7 +43,6 @@ PRINTF_darwin = "--enable-included-printf=yes"
43PRINTF_mingw32 = "--enable-included-printf=yes" 43PRINTF_mingw32 = "--enable-included-printf=yes"
44EXTRA_OECONF = "${PRINTF} ${CORECONF}" 44EXTRA_OECONF = "${PRINTF} ${CORECONF}"
45EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" 45EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
46EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu"
47 46
48# Tell configure that we'll have dbus-daemon on the target for the tests 47# Tell configure that we'll have dbus-daemon on the target for the tests
49EXTRA_OECONF_class-target_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}" 48EXTRA_OECONF_class-target_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}"
diff --git a/meta/recipes-core/glibc/glibc-collateral.inc b/meta/recipes-core/glibc/glibc-collateral.inc
index 37f27ca448..de859d5ce9 100644
--- a/meta/recipes-core/glibc/glibc-collateral.inc
+++ b/meta/recipes-core/glibc/glibc-collateral.inc
@@ -18,5 +18,4 @@ do_compile[noexec] = "1"
18do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale" 18do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale"
19 19
20COMPATIBLE_HOST_libc-musl_class-target = "null" 20COMPATIBLE_HOST_libc-musl_class-target = "null"
21COMPATIBLE_HOST_libc-uclibc_class-target = "null"
22 21
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 9f7fa62a37..645be694b5 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -1,19 +1,3 @@
1#
2# For now, we will skip building of a gcc package if it is a uclibc one
3# and our build is not a uclibc one, and we skip a glibc one if our build
4# is a uclibc build.
5#
6# See the note in gcc/gcc_3.4.0.oe
7#
8
9python __anonymous () {
10 import bb, re
11 uc_os = (re.match('.*uclibc*', d.getVar('TARGET_OS')) != None)
12 if uc_os:
13 raise bb.parse.SkipPackage("incompatible with target %s" %
14 d.getVar('TARGET_OS'))
15}
16
17INHIBIT_SYSROOT_STRIP = "1" 1INHIBIT_SYSROOT_STRIP = "1"
18 2
19PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" 3PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
diff --git a/meta/recipes-core/glibc/glibc_2.25.bb b/meta/recipes-core/glibc/glibc_2.25.bb
index 83a1249b8c..c37438a2d1 100644
--- a/meta/recipes-core/glibc/glibc_2.25.bb
+++ b/meta/recipes-core/glibc/glibc_2.25.bb
@@ -67,7 +67,6 @@ GLIBC_BROKEN_LOCALES = ""
67# this helps in easing out parsing for non-glibc system libraries 67# this helps in easing out parsing for non-glibc system libraries
68# 68#
69COMPATIBLE_HOST_libc-musl_class-target = "null" 69COMPATIBLE_HOST_libc-musl_class-target = "null"
70COMPATIBLE_HOST_libc-uclibc_class-target = "null"
71 70
72EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ 71EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
73 --without-cvs --disable-profile \ 72 --without-cvs --disable-profile \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index 7d6d41473a..af0ce2013e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -33,7 +33,6 @@ SANITIZERS_nios2 = ""
33SANITIZERS_powerpc64 = "" 33SANITIZERS_powerpc64 = ""
34SANITIZERS_sparc = "" 34SANITIZERS_sparc = ""
35SANITIZERS_libc-musl = "" 35SANITIZERS_libc-musl = ""
36SANITIZERS_libc-uclibc = ""
37 36
38RRECOMMENDS_packagegroup-core-sdk = "\ 37RRECOMMENDS_packagegroup-core-sdk = "\
39 libgomp \ 38 libgomp \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 946c947c8f..51335e232d 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -31,23 +31,15 @@ PROFILETOOLS = "\
31PERF = "perf" 31PERF = "perf"
32PERF_libc-musl = "" 32PERF_libc-musl = ""
33 33
34# systemtap needs elfutils which is not fully buildable on uclibc 34# systemtap needs elfutils which is not fully buildable on some arches/libcs
35# hence we exclude it from uclibc based builds
36SYSTEMTAP = "systemtap" 35SYSTEMTAP = "systemtap"
37SYSTEMTAP_libc-uclibc = ""
38SYSTEMTAP_libc-musl = "" 36SYSTEMTAP_libc-musl = ""
39SYSTEMTAP_mipsarch = "" 37SYSTEMTAP_mipsarch = ""
40SYSTEMTAP_nios2 = "" 38SYSTEMTAP_nios2 = ""
41SYSTEMTAP_aarch64 = "" 39SYSTEMTAP_aarch64 = ""
42 40
43# lttng-ust uses sched_getcpu() which is not there on uclibc 41# lttng-ust uses sched_getcpu() which is not there on for some platforms.
44# for some of the architectures it can be patched to call the
45# syscall directly but for x86_64 __NR_getcpu is a vsyscall
46# which means we can not use syscall() to call it. So we ignore
47# it for x86_64/uclibc
48
49LTTNGUST = "lttng-ust" 42LTTNGUST = "lttng-ust"
50LTTNGUST_libc-uclibc = ""
51LTTNGUST_libc-musl = "" 43LTTNGUST_libc-musl = ""
52 44
53LTTNGTOOLS = "lttng-tools" 45LTTNGTOOLS = "lttng-tools"
@@ -60,7 +52,6 @@ BABELTRACE = "babeltrace"
60# valgrind does not work on the following configurations/architectures 52# valgrind does not work on the following configurations/architectures
61 53
62VALGRIND = "valgrind" 54VALGRIND = "valgrind"
63VALGRIND_libc-uclibc = ""
64VALGRIND_libc-musl = "" 55VALGRIND_libc-musl = ""
65VALGRIND_mipsarch = "" 56VALGRIND_mipsarch = ""
66VALGRIND_nios2 = "" 57VALGRIND_nios2 = ""
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 29e0be6ae5..a4def99884 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -19,5 +19,3 @@ SRCREV = "a1e2ef7ec912902d8142e7cb5830cbfb47dba86c"
19SRC_URI = "git://github.com/systemd/systemd.git;protocol=git" 19SRC_URI = "git://github.com/systemd/systemd.git;protocol=git"
20 20
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22
23LDFLAGS_append_libc-uclibc = " -lrt -lssp_nonshared -lssp "
diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb
index 6aeccbd422..a6e6401da7 100644
--- a/meta/recipes-core/systemd/systemd_232.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -35,9 +35,6 @@ SRC_URI += " \
35 file://0020-back-port-233-don-t-use-the-unified-hierarchy-for-the-systemd.patch \ 35 file://0020-back-port-233-don-t-use-the-unified-hierarchy-for-the-systemd.patch \
36 file://0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch \ 36 file://0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch \
37" 37"
38SRC_URI_append_libc-uclibc = "\
39 file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \
40"
41SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" 38SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
42 39
43PACKAGECONFIG ??= "xz \ 40PACKAGECONFIG ??= "xz \