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-16 10:58:25 +0100 |
commit | 653704e9cf325cb494eb23facca19e9f05132ffd (patch) | |
tree | e0dccc9d5bf3b679257c905748fa269268d281e6 /meta/recipes-extended | |
parent | 07f6c0b464f0671bc39116317138e4ddf27bdae9 (diff) | |
download | openembedded-core-contrib-653704e9cf325cb494eb23facca19e9f05132ffd.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils.inc | 7 | ||||
-rw-r--r-- | meta/recipes-extended/findutils/findutils.inc | 7 | ||||
-rw-r--r-- | meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb | 3 | ||||
-rw-r--r-- | meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam/use-utmpx.patch | 233 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.3.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/parted/parted_3.2.bb | 1 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 1 | ||||
-rw-r--r-- | meta/recipes-extended/sysstat/sysstat.inc | 1 | ||||
-rw-r--r-- | meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb | 1 |
10 files changed, 0 insertions, 258 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc index 243341aa9c6..c81348b3da2 100644 --- a/meta/recipes-extended/diffutils/diffutils.inc +++ b/meta/recipes-extended/diffutils/diffutils.inc @@ -6,13 +6,6 @@ SECTION = "base" inherit autotools texinfo update-alternatives gettext -# diffutils assumes non-glibc compilation with uclibc and -# this causes it to generate its own implementations of -# standard functionality. regex.c actually breaks compilation -# because it uses __mempcpy, there are other things (TBD: -# see diffutils.mk in buildroot) -EXTRA_OECONF_libc-uclibc = "--without-included-regex" - ALTERNATIVE_${PN} = "diff cmp" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index bfedf874be9..ad3642923ca 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc @@ -13,11 +13,4 @@ inherit autotools gettext texinfo update-alternatives upstream-version-is-even ALTERNATIVE_${PN} = "find xargs" ALTERNATIVE_PRIORITY = "100" -# diffutils assumes non-glibc compilation with uclibc and -# this causes it to generate its own implementations of -# standard functionality. regex.c actually breaks compilation -# because it uses __mempcpy, there are other things (TBD: -# see diffutils.mk in buildroot) -EXTRA_OECONF_libc-uclibc = "--without-included-regex" - BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb index f41d2f3e3d8..7be8e1062c6 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb @@ -19,9 +19,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2;name=libtirpc \ file://0001-Fix-for-CVE-2017-8779.patch \ " -SRC_URI_append_libc-uclibc = " file://remove-des-functionality.patch \ - " - SRC_URI_append_libc-musl = " \ file://Use-netbsd-queue.h.patch \ " diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index 45d7bf45240..c23d53376a9 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb @@ -39,8 +39,6 @@ inherit gettext do_patch[depends] = "quilt-native:do_populate_sysroot" -LDFLAGS_append_libc-uclibc = " -lintl " - # The Makefile is lame, no parallel build PARALLEL_MAKE = "" diff --git a/meta/recipes-extended/pam/libpam/use-utmpx.patch b/meta/recipes-extended/pam/libpam/use-utmpx.patch deleted file mode 100644 index dd04bbb8441..00000000000 --- a/meta/recipes-extended/pam/libpam/use-utmpx.patch +++ /dev/null @@ -1,233 +0,0 @@ -utmp() may not be configured in and use posix compliant utmpx always -UTMP is SVID legacy, UTMPX is mandated by POSIX - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: Linux-PAM-1.2.1/libpam/pam_modutil_getlogin.c -=================================================================== ---- Linux-PAM-1.2.1.orig/libpam/pam_modutil_getlogin.c -+++ Linux-PAM-1.2.1/libpam/pam_modutil_getlogin.c -@@ -10,8 +10,7 @@ - - #include <stdlib.h> - #include <unistd.h> --#include <utmp.h> -- -+#include <utmpx.h> - #define _PAMMODUTIL_GETLOGIN "_pammodutil_getlogin" - - const char * -@@ -22,7 +21,7 @@ pam_modutil_getlogin(pam_handle_t *pamh) - const void *void_curr_tty; - const char *curr_tty; - char *curr_user; -- struct utmp *ut, line; -+ struct utmpx *ut, line; - - status = pam_get_data(pamh, _PAMMODUTIL_GETLOGIN, &logname); - if (status == PAM_SUCCESS) { -@@ -48,10 +47,10 @@ pam_modutil_getlogin(pam_handle_t *pamh) - } - logname = NULL; - -- setutent(); -+ setutxent(); - strncpy(line.ut_line, curr_tty, sizeof(line.ut_line)); - -- if ((ut = getutline(&line)) == NULL) { -+ if ((ut = getutxline(&line)) == NULL) { - goto clean_up_and_go_home; - } - -@@ -74,7 +73,7 @@ pam_modutil_getlogin(pam_handle_t *pamh) - - clean_up_and_go_home: - -- endutent(); -+ endutxent(); - - return logname; - } -Index: Linux-PAM-1.2.1/modules/pam_issue/pam_issue.c -=================================================================== ---- Linux-PAM-1.2.1.orig/modules/pam_issue/pam_issue.c -+++ Linux-PAM-1.2.1/modules/pam_issue/pam_issue.c -@@ -25,7 +25,7 @@ - #include <string.h> - #include <unistd.h> - #include <sys/utsname.h> --#include <utmp.h> -+#include <utmpx.h> - #include <time.h> - #include <syslog.h> - -@@ -246,13 +246,13 @@ read_issue_quoted(pam_handle_t *pamh, FI - case 'U': - { - unsigned int users = 0; -- struct utmp *ut; -- setutent(); -- while ((ut = getutent())) { -+ struct utmpx *ut; -+ setutxent(); -+ while ((ut = getutxent())) { - if (ut->ut_type == USER_PROCESS) - ++users; - } -- endutent(); -+ endutxent(); - if (c == 'U') - snprintf (buf, sizeof buf, "%u %s", users, - (users == 1) ? "user" : "users"); -Index: Linux-PAM-1.2.1/modules/pam_lastlog/pam_lastlog.c -=================================================================== ---- Linux-PAM-1.2.1.orig/modules/pam_lastlog/pam_lastlog.c -+++ Linux-PAM-1.2.1/modules/pam_lastlog/pam_lastlog.c -@@ -15,8 +15,9 @@ - #include <errno.h> - #ifdef HAVE_UTMP_H - # include <utmp.h> --#else --# include <lastlog.h> -+#endif -+#ifdef HAVE_UTMPX_H -+# include <utmpx.h> - #endif - #include <pwd.h> - #include <stdlib.h> -@@ -27,6 +28,12 @@ - #include <syslog.h> - #include <unistd.h> - -+#ifndef HAVE_UTMP_H -+#define UT_LINESIZE 32 -+#define UT_HOSTSIZE 32 -+#define UT_NAMESIZE 256 -+#endif -+ - #if defined(hpux) || defined(sunos) || defined(solaris) - # ifndef _PATH_LASTLOG - # define _PATH_LASTLOG "/usr/adm/lastlog" -@@ -38,7 +45,7 @@ - # define UT_LINESIZE 12 - # endif /* UT_LINESIZE */ - #endif --#if defined(hpux) -+#if defined(hpux) || !defined HAVE_UTMP_H - struct lastlog { - time_t ll_time; - char ll_line[UT_LINESIZE]; -@@ -447,8 +454,8 @@ last_login_failed(pam_handle_t *pamh, in - { - int retval; - int fd; -- struct utmp ut; -- struct utmp utuser; -+ struct utmpx ut; -+ struct utmpx utuser; - int failed = 0; - char the_time[256]; - char *date = NULL; -Index: Linux-PAM-1.2.1/modules/pam_limits/pam_limits.c -=================================================================== ---- Linux-PAM-1.2.1.orig/modules/pam_limits/pam_limits.c -+++ Linux-PAM-1.2.1/modules/pam_limits/pam_limits.c -@@ -33,7 +33,7 @@ - #include <sys/resource.h> - #include <limits.h> - #include <glob.h> --#include <utmp.h> -+#include <utmpx.h> - #ifndef UT_USER /* some systems have ut_name instead of ut_user */ - #define UT_USER ut_user - #endif -@@ -227,7 +227,7 @@ static int - check_logins (pam_handle_t *pamh, const char *name, int limit, int ctrl, - struct pam_limit_s *pl) - { -- struct utmp *ut; -+ struct utmpx *ut; - int count; - - if (ctrl & PAM_DEBUG_ARG) { -@@ -242,7 +242,7 @@ check_logins (pam_handle_t *pamh, const - return LOGIN_ERR; - } - -- setutent(); -+ setutxent(); - - /* Because there is no definition about when an application - actually adds a utmp entry, some applications bizarrely do the -@@ -260,7 +260,7 @@ check_logins (pam_handle_t *pamh, const - count = 1; - } - -- while((ut = getutent())) { -+ while((ut = getutxent())) { - #ifdef USER_PROCESS - if (ut->ut_type != USER_PROCESS) { - continue; -@@ -296,7 +296,7 @@ check_logins (pam_handle_t *pamh, const - break; - } - } -- endutent(); -+ endutxent(); - if (count > limit) { - if (name) { - pam_syslog(pamh, LOG_WARNING, -Index: Linux-PAM-1.2.1/modules/pam_timestamp/pam_timestamp.c -=================================================================== ---- Linux-PAM-1.2.1.orig/modules/pam_timestamp/pam_timestamp.c -+++ Linux-PAM-1.2.1/modules/pam_timestamp/pam_timestamp.c -@@ -56,7 +56,7 @@ - #include <time.h> - #include <sys/time.h> - #include <unistd.h> --#include <utmp.h> -+#include <utmpx.h> - #include <syslog.h> - #include <paths.h> - #include "hmacsha1.h" -@@ -197,15 +197,15 @@ timestamp_good(time_t then, time_t now, - static int - check_login_time(const char *ruser, time_t timestamp) - { -- struct utmp utbuf, *ut; -+ struct utmpx utbuf, *ut; - time_t oldest_login = 0; - -- setutent(); -+ setutxent(); - while( - #ifdef HAVE_GETUTENT_R -- !getutent_r(&utbuf, &ut) -+ !getutxent_r(&utbuf, &ut) - #else -- (ut = getutent()) != NULL -+ (ut = getutxent()) != NULL - #endif - ) { - if (ut->ut_type != USER_PROCESS) { -@@ -218,7 +218,7 @@ check_login_time(const char *ruser, time - oldest_login = ut->ut_tv.tv_sec; - } - } -- endutent(); -+ endutxent(); - if(oldest_login == 0 || timestamp < oldest_login) { - return PAM_AUTH_ERR; - } -Index: Linux-PAM-1.2.1/modules/pam_unix/support.c -=================================================================== ---- Linux-PAM-1.2.1.orig/modules/pam_unix/support.c -+++ Linux-PAM-1.2.1/modules/pam_unix/support.c -@@ -13,7 +13,6 @@ - #include <pwd.h> - #include <shadow.h> - #include <limits.h> --#include <utmp.h> - #include <errno.h> - #include <signal.h> - #include <ctype.h> diff --git a/meta/recipes-extended/pam/libpam_1.3.0.bb b/meta/recipes-extended/pam/libpam_1.3.0.bb index df56d27627f..8f7753d0012 100644 --- a/meta/recipes-extended/pam/libpam_1.3.0.bb +++ b/meta/recipes-extended/pam/libpam_1.3.0.bb @@ -28,8 +28,6 @@ SRC_URI = "http://linux-pam.org/library/Linux-PAM-${PV}.tar.bz2 \ SRC_URI[md5sum] = "da4b2289b7cfb19583d54e9eaaef1c3a" SRC_URI[sha256sum] = "241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb" -SRC_URI_append_libc-uclibc = " file://use-utmpx.patch" - SRC_URI_append_libc-musl = " file://0001-Add-support-for-defining-missing-funcitonality.patch \ file://include_paths_header.patch \ " diff --git a/meta/recipes-extended/parted/parted_3.2.bb b/meta/recipes-extended/parted/parted_3.2.bb index 73548b77925..2bfdfb5f8f3 100644 --- a/meta/recipes-extended/parted/parted_3.2.bb +++ b/meta/recipes-extended/parted/parted_3.2.bb @@ -24,7 +24,6 @@ SRC_URI[md5sum] = "0247b6a7b314f8edeb618159fa95f9cb" SRC_URI[sha256sum] = "858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4" EXTRA_OECONF = "--disable-device-mapper" -LDFLAGS_append_libc-uclibc = " -liconv " inherit autotools pkgconfig gettext texinfo ptest diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 70ff68ee875..5e6b0bd9703 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -59,7 +59,6 @@ EXTRA_OECONF += "--without-audit \ NSCDOPT = "" NSCDOPT_class-native = "--without-nscd" NSCDOPT_class-nativesdk = "--without-nscd" -NSCDOPT_libc-uclibc = " --without-nscd" NSCDOPT_libc-glibc = "${@bb.utils.contains('DISTRO_FEATURES', 'libc-spawn', '--with-nscd', '--without-nscd', d)}" PAM_PLUGINS = "libpam-runtime \ diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index bb5629db4c8..18b0861bf99 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -55,4 +55,3 @@ pkg_postinst_${PN} () { FILES_${PN} += "${libdir}/sa" TARGET_CC_ARCH += "${LDFLAGS}" -LDFLAGS_append_libc-uclibc = " -lintl" diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index 5fdbbced720..54587dc2ca0 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb @@ -73,7 +73,6 @@ EXTRA_OEMAKE = "'CC=${CC}' \ 'EXTRA_CFLAGS=${CFLAGS} -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len'" EXTRA_OEMAKE_NETGROUP = "-DNETGROUP -DUSE_GETDOMAIN" -EXTRA_OEMAKE_NETGROUP_libc-uclibc = "-DUSE_GETDOMAIN" EXTRA_OEMAKE_NETGROUP_libc-musl = "-DUSE_GETDOMAIN" EXTRA_OEMAKE_append_libc-musl = " 'LIBS='" |