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-connectivity | |
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-connectivity')
-rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 5 | ||||
-rw-r--r-- | meta/recipes-connectivity/ofono/ofono_1.20.bb | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_7.5p1.bb | 6 |
3 files changed, 0 insertions, 13 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index faa8741dc5..7814464940 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc | |||
@@ -63,10 +63,6 @@ EXTRA_OECONF = "--with-avahi-priv-access-group=adm \ | |||
63 | EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}" | 63 | EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}" |
64 | EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" | 64 | EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" |
65 | 65 | ||
66 | |||
67 | LDFLAGS_append_libc-uclibc = " -lintl" | ||
68 | LDFLAGS_append_uclinux-uclibc = " -lintl" | ||
69 | |||
70 | do_configure_prepend() { | 66 | do_configure_prepend() { |
71 | sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac | 67 | sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac |
72 | 68 | ||
@@ -111,7 +107,6 @@ FILES_avahi-utils = "${bindir}/avahi-*" | |||
111 | 107 | ||
112 | RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" | 108 | RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" |
113 | 109 | ||
114 | # uclibc has no nss | ||
115 | RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns" | 110 | RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns" |
116 | RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns" | 111 | RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns" |
117 | 112 | ||
diff --git a/meta/recipes-connectivity/ofono/ofono_1.20.bb b/meta/recipes-connectivity/ofono/ofono_1.20.bb index 356a996d3e..18f983e854 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.20.bb +++ b/meta/recipes-connectivity/ofono/ofono_1.20.bb | |||
@@ -6,5 +6,3 @@ SRC_URI = "\ | |||
6 | " | 6 | " |
7 | SRC_URI[md5sum] = "fad0630fce6a9aecdb7db37bc1f1db7d" | 7 | SRC_URI[md5sum] = "fad0630fce6a9aecdb7db37bc1f1db7d" |
8 | SRC_URI[sha256sum] = "5d7ba8f481a7715d013a79f8d6477eb89d8aaae399395d5d008a1317c34a31d5" | 8 | SRC_URI[sha256sum] = "5d7ba8f481a7715d013a79f8d6477eb89d8aaae399395d5d008a1317c34a31d5" |
9 | |||
10 | CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" | ||
diff --git a/meta/recipes-connectivity/openssh/openssh_7.5p1.bb b/meta/recipes-connectivity/openssh/openssh_7.5p1.bb index 5b96745aae..7bd313bb4e 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.5p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.5p1.bb | |||
@@ -69,12 +69,6 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd" | |||
69 | # We don't want to depend on libblockfile | 69 | # We don't want to depend on libblockfile |
70 | CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" | 70 | CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" |
71 | 71 | ||
72 | # This is a workaround for uclibc because including stdio.h | ||
73 | # pulls in pthreads.h and causes conflicts in function prototypes. | ||
74 | # This results in compilation failure, so unless this is fixed, | ||
75 | # disable pam for uclibc. | ||
76 | EXTRA_OECONF_append_libc-uclibc=" --without-pam" | ||
77 | |||
78 | do_configure_prepend () { | 72 | do_configure_prepend () { |
79 | export LD="${CC}" | 73 | export LD="${CC}" |
80 | install -m 0644 ${WORKDIR}/sshd_config ${B}/ | 74 | install -m 0644 ${WORKDIR}/sshd_config ${B}/ |