summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
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-extended
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-extended')
-rw-r--r--meta/recipes-extended/diffutils/diffutils.inc7
-rw-r--r--meta/recipes-extended/findutils/findutils.inc7
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb3
-rw-r--r--meta/recipes-extended/net-tools/net-tools_1.60-26.bb2
-rw-r--r--meta/recipes-extended/pam/libpam/use-utmpx.patch233
-rw-r--r--meta/recipes-extended/pam/libpam_1.3.0.bb2
-rw-r--r--meta/recipes-extended/parted/parted_3.2.bb1
-rw-r--r--meta/recipes-extended/shadow/shadow.inc1
-rw-r--r--meta/recipes-extended/sysstat/sysstat.inc1
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb1
10 files changed, 0 insertions, 258 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc
index 243341aa9c..c81348b3da 100644
--- a/meta/recipes-extended/diffutils/diffutils.inc
+++ b/meta/recipes-extended/diffutils/diffutils.inc
@@ -6,13 +6,6 @@ SECTION = "base"
6 6
7inherit autotools texinfo update-alternatives gettext 7inherit autotools texinfo update-alternatives gettext
8 8
9# diffutils assumes non-glibc compilation with uclibc and
10# this causes it to generate its own implementations of
11# standard functionality. regex.c actually breaks compilation
12# because it uses __mempcpy, there are other things (TBD:
13# see diffutils.mk in buildroot)
14EXTRA_OECONF_libc-uclibc = "--without-included-regex"
15
16ALTERNATIVE_${PN} = "diff cmp" 9ALTERNATIVE_${PN} = "diff cmp"
17ALTERNATIVE_PRIORITY = "100" 10ALTERNATIVE_PRIORITY = "100"
18 11
diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc
index bfedf874be..ad3642923c 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
13ALTERNATIVE_${PN} = "find xargs" 13ALTERNATIVE_${PN} = "find xargs"
14ALTERNATIVE_PRIORITY = "100" 14ALTERNATIVE_PRIORITY = "100"
15 15
16# diffutils assumes non-glibc compilation with uclibc and
17# this causes it to generate its own implementations of
18# standard functionality. regex.c actually breaks compilation
19# because it uses __mempcpy, there are other things (TBD:
20# see diffutils.mk in buildroot)
21EXTRA_OECONF_libc-uclibc = "--without-included-regex"
22
23BBCLASSEXTEND = "native nativesdk" 16BBCLASSEXTEND = "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 f41d2f3e3d..7be8e1062c 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 \
19 file://0001-Fix-for-CVE-2017-8779.patch \ 19 file://0001-Fix-for-CVE-2017-8779.patch \
20 " 20 "
21 21
22SRC_URI_append_libc-uclibc = " file://remove-des-functionality.patch \
23 "
24
25SRC_URI_append_libc-musl = " \ 22SRC_URI_append_libc-musl = " \
26 file://Use-netbsd-queue.h.patch \ 23 file://Use-netbsd-queue.h.patch \
27 " 24 "
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 45d7bf4524..c23d53376a 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
39 39
40do_patch[depends] = "quilt-native:do_populate_sysroot" 40do_patch[depends] = "quilt-native:do_populate_sysroot"
41 41
42LDFLAGS_append_libc-uclibc = " -lintl "
43
44# The Makefile is lame, no parallel build 42# The Makefile is lame, no parallel build
45PARALLEL_MAKE = "" 43PARALLEL_MAKE = ""
46 44
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 dd04bbb844..0000000000
--- a/meta/recipes-extended/pam/libpam/use-utmpx.patch
+++ /dev/null
@@ -1,233 +0,0 @@
1utmp() may not be configured in and use posix compliant utmpx always
2UTMP is SVID legacy, UTMPX is mandated by POSIX
3
4Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Index: Linux-PAM-1.2.1/libpam/pam_modutil_getlogin.c
7===================================================================
8--- Linux-PAM-1.2.1.orig/libpam/pam_modutil_getlogin.c
9+++ Linux-PAM-1.2.1/libpam/pam_modutil_getlogin.c
10@@ -10,8 +10,7 @@
11
12 #include <stdlib.h>
13 #include <unistd.h>
14-#include <utmp.h>
15-
16+#include <utmpx.h>
17 #define _PAMMODUTIL_GETLOGIN "_pammodutil_getlogin"
18
19 const char *
20@@ -22,7 +21,7 @@ pam_modutil_getlogin(pam_handle_t *pamh)
21 const void *void_curr_tty;
22 const char *curr_tty;
23 char *curr_user;
24- struct utmp *ut, line;
25+ struct utmpx *ut, line;
26
27 status = pam_get_data(pamh, _PAMMODUTIL_GETLOGIN, &logname);
28 if (status == PAM_SUCCESS) {
29@@ -48,10 +47,10 @@ pam_modutil_getlogin(pam_handle_t *pamh)
30 }
31 logname = NULL;
32
33- setutent();
34+ setutxent();
35 strncpy(line.ut_line, curr_tty, sizeof(line.ut_line));
36
37- if ((ut = getutline(&line)) == NULL) {
38+ if ((ut = getutxline(&line)) == NULL) {
39 goto clean_up_and_go_home;
40 }
41
42@@ -74,7 +73,7 @@ pam_modutil_getlogin(pam_handle_t *pamh)
43
44 clean_up_and_go_home:
45
46- endutent();
47+ endutxent();
48
49 return logname;
50 }
51Index: Linux-PAM-1.2.1/modules/pam_issue/pam_issue.c
52===================================================================
53--- Linux-PAM-1.2.1.orig/modules/pam_issue/pam_issue.c
54+++ Linux-PAM-1.2.1/modules/pam_issue/pam_issue.c
55@@ -25,7 +25,7 @@
56 #include <string.h>
57 #include <unistd.h>
58 #include <sys/utsname.h>
59-#include <utmp.h>
60+#include <utmpx.h>
61 #include <time.h>
62 #include <syslog.h>
63
64@@ -246,13 +246,13 @@ read_issue_quoted(pam_handle_t *pamh, FI
65 case 'U':
66 {
67 unsigned int users = 0;
68- struct utmp *ut;
69- setutent();
70- while ((ut = getutent())) {
71+ struct utmpx *ut;
72+ setutxent();
73+ while ((ut = getutxent())) {
74 if (ut->ut_type == USER_PROCESS)
75 ++users;
76 }
77- endutent();
78+ endutxent();
79 if (c == 'U')
80 snprintf (buf, sizeof buf, "%u %s", users,
81 (users == 1) ? "user" : "users");
82Index: Linux-PAM-1.2.1/modules/pam_lastlog/pam_lastlog.c
83===================================================================
84--- Linux-PAM-1.2.1.orig/modules/pam_lastlog/pam_lastlog.c
85+++ Linux-PAM-1.2.1/modules/pam_lastlog/pam_lastlog.c
86@@ -15,8 +15,9 @@
87 #include <errno.h>
88 #ifdef HAVE_UTMP_H
89 # include <utmp.h>
90-#else
91-# include <lastlog.h>
92+#endif
93+#ifdef HAVE_UTMPX_H
94+# include <utmpx.h>
95 #endif
96 #include <pwd.h>
97 #include <stdlib.h>
98@@ -27,6 +28,12 @@
99 #include <syslog.h>
100 #include <unistd.h>
101
102+#ifndef HAVE_UTMP_H
103+#define UT_LINESIZE 32
104+#define UT_HOSTSIZE 32
105+#define UT_NAMESIZE 256
106+#endif
107+
108 #if defined(hpux) || defined(sunos) || defined(solaris)
109 # ifndef _PATH_LASTLOG
110 # define _PATH_LASTLOG "/usr/adm/lastlog"
111@@ -38,7 +45,7 @@
112 # define UT_LINESIZE 12
113 # endif /* UT_LINESIZE */
114 #endif
115-#if defined(hpux)
116+#if defined(hpux) || !defined HAVE_UTMP_H
117 struct lastlog {
118 time_t ll_time;
119 char ll_line[UT_LINESIZE];
120@@ -447,8 +454,8 @@ last_login_failed(pam_handle_t *pamh, in
121 {
122 int retval;
123 int fd;
124- struct utmp ut;
125- struct utmp utuser;
126+ struct utmpx ut;
127+ struct utmpx utuser;
128 int failed = 0;
129 char the_time[256];
130 char *date = NULL;
131Index: Linux-PAM-1.2.1/modules/pam_limits/pam_limits.c
132===================================================================
133--- Linux-PAM-1.2.1.orig/modules/pam_limits/pam_limits.c
134+++ Linux-PAM-1.2.1/modules/pam_limits/pam_limits.c
135@@ -33,7 +33,7 @@
136 #include <sys/resource.h>
137 #include <limits.h>
138 #include <glob.h>
139-#include <utmp.h>
140+#include <utmpx.h>
141 #ifndef UT_USER /* some systems have ut_name instead of ut_user */
142 #define UT_USER ut_user
143 #endif
144@@ -227,7 +227,7 @@ static int
145 check_logins (pam_handle_t *pamh, const char *name, int limit, int ctrl,
146 struct pam_limit_s *pl)
147 {
148- struct utmp *ut;
149+ struct utmpx *ut;
150 int count;
151
152 if (ctrl & PAM_DEBUG_ARG) {
153@@ -242,7 +242,7 @@ check_logins (pam_handle_t *pamh, const
154 return LOGIN_ERR;
155 }
156
157- setutent();
158+ setutxent();
159
160 /* Because there is no definition about when an application
161 actually adds a utmp entry, some applications bizarrely do the
162@@ -260,7 +260,7 @@ check_logins (pam_handle_t *pamh, const
163 count = 1;
164 }
165
166- while((ut = getutent())) {
167+ while((ut = getutxent())) {
168 #ifdef USER_PROCESS
169 if (ut->ut_type != USER_PROCESS) {
170 continue;
171@@ -296,7 +296,7 @@ check_logins (pam_handle_t *pamh, const
172 break;
173 }
174 }
175- endutent();
176+ endutxent();
177 if (count > limit) {
178 if (name) {
179 pam_syslog(pamh, LOG_WARNING,
180Index: Linux-PAM-1.2.1/modules/pam_timestamp/pam_timestamp.c
181===================================================================
182--- Linux-PAM-1.2.1.orig/modules/pam_timestamp/pam_timestamp.c
183+++ Linux-PAM-1.2.1/modules/pam_timestamp/pam_timestamp.c
184@@ -56,7 +56,7 @@
185 #include <time.h>
186 #include <sys/time.h>
187 #include <unistd.h>
188-#include <utmp.h>
189+#include <utmpx.h>
190 #include <syslog.h>
191 #include <paths.h>
192 #include "hmacsha1.h"
193@@ -197,15 +197,15 @@ timestamp_good(time_t then, time_t now,
194 static int
195 check_login_time(const char *ruser, time_t timestamp)
196 {
197- struct utmp utbuf, *ut;
198+ struct utmpx utbuf, *ut;
199 time_t oldest_login = 0;
200
201- setutent();
202+ setutxent();
203 while(
204 #ifdef HAVE_GETUTENT_R
205- !getutent_r(&utbuf, &ut)
206+ !getutxent_r(&utbuf, &ut)
207 #else
208- (ut = getutent()) != NULL
209+ (ut = getutxent()) != NULL
210 #endif
211 ) {
212 if (ut->ut_type != USER_PROCESS) {
213@@ -218,7 +218,7 @@ check_login_time(const char *ruser, time
214 oldest_login = ut->ut_tv.tv_sec;
215 }
216 }
217- endutent();
218+ endutxent();
219 if(oldest_login == 0 || timestamp < oldest_login) {
220 return PAM_AUTH_ERR;
221 }
222Index: Linux-PAM-1.2.1/modules/pam_unix/support.c
223===================================================================
224--- Linux-PAM-1.2.1.orig/modules/pam_unix/support.c
225+++ Linux-PAM-1.2.1/modules/pam_unix/support.c
226@@ -13,7 +13,6 @@
227 #include <pwd.h>
228 #include <shadow.h>
229 #include <limits.h>
230-#include <utmp.h>
231 #include <errno.h>
232 #include <signal.h>
233 #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 df56d27627..8f7753d001 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 \
28SRC_URI[md5sum] = "da4b2289b7cfb19583d54e9eaaef1c3a" 28SRC_URI[md5sum] = "da4b2289b7cfb19583d54e9eaaef1c3a"
29SRC_URI[sha256sum] = "241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb" 29SRC_URI[sha256sum] = "241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb"
30 30
31SRC_URI_append_libc-uclibc = " file://use-utmpx.patch"
32
33SRC_URI_append_libc-musl = " file://0001-Add-support-for-defining-missing-funcitonality.patch \ 31SRC_URI_append_libc-musl = " file://0001-Add-support-for-defining-missing-funcitonality.patch \
34 file://include_paths_header.patch \ 32 file://include_paths_header.patch \
35 " 33 "
diff --git a/meta/recipes-extended/parted/parted_3.2.bb b/meta/recipes-extended/parted/parted_3.2.bb
index 73548b7792..2bfdfb5f8f 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"
24SRC_URI[sha256sum] = "858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4" 24SRC_URI[sha256sum] = "858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4"
25 25
26EXTRA_OECONF = "--disable-device-mapper" 26EXTRA_OECONF = "--disable-device-mapper"
27LDFLAGS_append_libc-uclibc = " -liconv "
28 27
29inherit autotools pkgconfig gettext texinfo ptest 28inherit autotools pkgconfig gettext texinfo ptest
30 29
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index 70ff68ee87..5e6b0bd970 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -59,7 +59,6 @@ EXTRA_OECONF += "--without-audit \
59NSCDOPT = "" 59NSCDOPT = ""
60NSCDOPT_class-native = "--without-nscd" 60NSCDOPT_class-native = "--without-nscd"
61NSCDOPT_class-nativesdk = "--without-nscd" 61NSCDOPT_class-nativesdk = "--without-nscd"
62NSCDOPT_libc-uclibc = " --without-nscd"
63NSCDOPT_libc-glibc = "${@bb.utils.contains('DISTRO_FEATURES', 'libc-spawn', '--with-nscd', '--without-nscd', d)}" 62NSCDOPT_libc-glibc = "${@bb.utils.contains('DISTRO_FEATURES', 'libc-spawn', '--with-nscd', '--without-nscd', d)}"
64 63
65PAM_PLUGINS = "libpam-runtime \ 64PAM_PLUGINS = "libpam-runtime \
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index bb5629db4c..18b0861bf9 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -55,4 +55,3 @@ pkg_postinst_${PN} () {
55FILES_${PN} += "${libdir}/sa" 55FILES_${PN} += "${libdir}/sa"
56 56
57TARGET_CC_ARCH += "${LDFLAGS}" 57TARGET_CC_ARCH += "${LDFLAGS}"
58LDFLAGS_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 5fdbbced72..54587dc2ca 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}' \
73 'EXTRA_CFLAGS=${CFLAGS} -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len'" 73 'EXTRA_CFLAGS=${CFLAGS} -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len'"
74 74
75EXTRA_OEMAKE_NETGROUP = "-DNETGROUP -DUSE_GETDOMAIN" 75EXTRA_OEMAKE_NETGROUP = "-DNETGROUP -DUSE_GETDOMAIN"
76EXTRA_OEMAKE_NETGROUP_libc-uclibc = "-DUSE_GETDOMAIN"
77EXTRA_OEMAKE_NETGROUP_libc-musl = "-DUSE_GETDOMAIN" 76EXTRA_OEMAKE_NETGROUP_libc-musl = "-DUSE_GETDOMAIN"
78 77
79EXTRA_OEMAKE_append_libc-musl = " 'LIBS='" 78EXTRA_OEMAKE_append_libc-musl = " 'LIBS='"