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/recipes-core | |
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/recipes-core')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext_0.19.8.1.bb | 8 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-collateral.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 16 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc_2.25.bb | 1 | ||||
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 1 | ||||
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 13 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_232.bb | 3 |
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: |
76 | def features_to_busybox_conf(d): | 76 | def 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 | ||
25 | PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses," | 25 | PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses," |
26 | 26 | ||
27 | LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " | ||
28 | |||
29 | inherit autotools texinfo | 27 | inherit autotools texinfo |
30 | 28 | ||
31 | EXTRA_OECONF += "--without-lispdir \ | 29 | EXTRA_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 | " |
89 | FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so.* \ | ||
90 | ${libdir}/charset.alias \ | ||
91 | " | ||
92 | FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ | 87 | FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ |
93 | ${includedir}/autosprintf.h \ | 88 | ${includedir}/autosprintf.h \ |
94 | " | 89 | " |
95 | FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.so \ | ||
96 | ${includedir}/libintl.h \ | ||
97 | " | ||
98 | FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ | 90 | FILES_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" | |||
43 | PRINTF_mingw32 = "--enable-included-printf=yes" | 43 | PRINTF_mingw32 = "--enable-included-printf=yes" |
44 | EXTRA_OECONF = "${PRINTF} ${CORECONF}" | 44 | EXTRA_OECONF = "${PRINTF} ${CORECONF}" |
45 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" | 45 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" |
46 | EXTRA_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 |
49 | EXTRA_OECONF_class-target_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}" | 48 | EXTRA_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" | |||
18 | do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale" | 18 | do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale" |
19 | 19 | ||
20 | COMPATIBLE_HOST_libc-musl_class-target = "null" | 20 | COMPATIBLE_HOST_libc-musl_class-target = "null" |
21 | COMPATIBLE_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 | |||
9 | python __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 | |||
17 | INHIBIT_SYSROOT_STRIP = "1" | 1 | INHIBIT_SYSROOT_STRIP = "1" |
18 | 2 | ||
19 | PACKAGES = "${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" | 3 | PACKAGES = "${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 | # |
69 | COMPATIBLE_HOST_libc-musl_class-target = "null" | 69 | COMPATIBLE_HOST_libc-musl_class-target = "null" |
70 | COMPATIBLE_HOST_libc-uclibc_class-target = "null" | ||
71 | 70 | ||
72 | EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ | 71 | EXTRA_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 = "" | |||
33 | SANITIZERS_powerpc64 = "" | 33 | SANITIZERS_powerpc64 = "" |
34 | SANITIZERS_sparc = "" | 34 | SANITIZERS_sparc = "" |
35 | SANITIZERS_libc-musl = "" | 35 | SANITIZERS_libc-musl = "" |
36 | SANITIZERS_libc-uclibc = "" | ||
37 | 36 | ||
38 | RRECOMMENDS_packagegroup-core-sdk = "\ | 37 | RRECOMMENDS_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 = "\ | |||
31 | PERF = "perf" | 31 | PERF = "perf" |
32 | PERF_libc-musl = "" | 32 | PERF_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 | ||
36 | SYSTEMTAP = "systemtap" | 35 | SYSTEMTAP = "systemtap" |
37 | SYSTEMTAP_libc-uclibc = "" | ||
38 | SYSTEMTAP_libc-musl = "" | 36 | SYSTEMTAP_libc-musl = "" |
39 | SYSTEMTAP_mipsarch = "" | 37 | SYSTEMTAP_mipsarch = "" |
40 | SYSTEMTAP_nios2 = "" | 38 | SYSTEMTAP_nios2 = "" |
41 | SYSTEMTAP_aarch64 = "" | 39 | SYSTEMTAP_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 | |||
49 | LTTNGUST = "lttng-ust" | 42 | LTTNGUST = "lttng-ust" |
50 | LTTNGUST_libc-uclibc = "" | ||
51 | LTTNGUST_libc-musl = "" | 43 | LTTNGUST_libc-musl = "" |
52 | 44 | ||
53 | LTTNGTOOLS = "lttng-tools" | 45 | LTTNGTOOLS = "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 | ||
62 | VALGRIND = "valgrind" | 54 | VALGRIND = "valgrind" |
63 | VALGRIND_libc-uclibc = "" | ||
64 | VALGRIND_libc-musl = "" | 55 | VALGRIND_libc-musl = "" |
65 | VALGRIND_mipsarch = "" | 56 | VALGRIND_mipsarch = "" |
66 | VALGRIND_nios2 = "" | 57 | VALGRIND_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" | |||
19 | SRC_URI = "git://github.com/systemd/systemd.git;protocol=git" | 19 | SRC_URI = "git://github.com/systemd/systemd.git;protocol=git" |
20 | 20 | ||
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | |||
23 | LDFLAGS_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 | " |
38 | SRC_URI_append_libc-uclibc = "\ | ||
39 | file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \ | ||
40 | " | ||
41 | SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" | 38 | SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" |
42 | 39 | ||
43 | PACKAGECONFIG ??= "xz \ | 40 | PACKAGECONFIG ??= "xz \ |