summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc4
-rw-r--r--meta/recipes-core/util-linux/util-linux/avoid_unsupported_grep_opts.patch57
-rw-r--r--meta/recipes-core/util-linux/util-linux/avoid_unsupported_sleep_param.patch20
-rw-r--r--meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch27
-rw-r--r--meta/recipes-core/util-linux/util-linux/ptest.patch16
-rw-r--r--meta/recipes-core/util-linux/util-linux/util-linux-native.patch57
-rw-r--r--meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch27
-rw-r--r--meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch21
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.28.bb (renamed from meta/recipes-core/util-linux/util-linux_2.27.1.bb)15
9 files changed, 49 insertions, 195 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index c0f25409a6..bac1a37f0a 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c
17 file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \ 17 file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \
18 file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" 18 file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16"
19 19
20inherit autotools gettext pkgconfig systemd update-alternatives python3-dir ptest bash-completion 20inherit autotools gettext pkgconfig systemd update-alternatives python3-dir bash-completion ptest
21DEPENDS = "zlib ncurses" 21DEPENDS = "zlib ncurses"
22DEPENDS_append_class-native = " lzo-native" 22DEPENDS_append_class-native = " lzo-native"
23DEPENDS_append_class-nativesdk = " lzo-native" 23DEPENDS_append_class-nativesdk = " lzo-native"
@@ -282,7 +282,7 @@ python populate_packages_prepend() {
282 extra_depends='', prepend=True, allow_links=True) 282 extra_depends='', prepend=True, allow_links=True)
283} 283}
284 284
285RDEPENDS_${PN}-ptest = "bash" 285RDEPENDS_${PN}-ptest = "bash grep coreutils"
286 286
287do_compile_ptest() { 287do_compile_ptest() {
288 oe_runmake buildtest-TESTS 288 oe_runmake buildtest-TESTS
diff --git a/meta/recipes-core/util-linux/util-linux/avoid_unsupported_grep_opts.patch b/meta/recipes-core/util-linux/util-linux/avoid_unsupported_grep_opts.patch
deleted file mode 100644
index a0d5efad0f..0000000000
--- a/meta/recipes-core/util-linux/util-linux/avoid_unsupported_grep_opts.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1Avoid unsupported grep options
2
3Signed-off-by: Tudor Florea <tudor.florea@enea.com>
4Upstream-Status: Pending
5
6diff -ruN a/ts/ipcs/headers b/ts/ipcs/headers
7--- a/tests/ts/ipcs/headers 2013-09-04 11:03:36.118613250 +0200
8+++ b/teste/ts/ipcs/headers 2013-09-04 11:03:27.906958437 +0200
9@@ -22,35 +22,35 @@
10 ts_init "$*"
11
12 ts_log "test: shm headers"
13-$TS_CMD_IPCS -m -t | grep --after-context=1 "^---" >> $TS_OUTPUT
14-$TS_CMD_IPCS -m -p | grep --after-context=1 "^---" >> $TS_OUTPUT
15-$TS_CMD_IPCS -m -c | grep --after-context=1 "^---" >> $TS_OUTPUT
16+$TS_CMD_IPCS -m -t | grep -A 1 "^---" >> $TS_OUTPUT
17+$TS_CMD_IPCS -m -p | grep -A 1 "^---" >> $TS_OUTPUT
18+$TS_CMD_IPCS -m -c | grep -A 1 "^---" >> $TS_OUTPUT
19 $TS_CMD_IPCS -m -l | grep "^---" >> $TS_OUTPUT
20 $TS_CMD_IPCS -m -u | grep "^---" >> $TS_OUTPUT
21 echo >> $TS_OUTPUT
22
23 ts_log "test: mesg headers"
24-$TS_CMD_IPCS -q -t | grep --after-context=1 "^---" >> $TS_OUTPUT
25-$TS_CMD_IPCS -q -p | grep --after-context=1 "^---" >> $TS_OUTPUT
26-$TS_CMD_IPCS -q -c | grep --after-context=1 "^---" >> $TS_OUTPUT
27+$TS_CMD_IPCS -q -t | grep -A 1 "^---" >> $TS_OUTPUT
28+$TS_CMD_IPCS -q -p | grep -A 1 "^---" >> $TS_OUTPUT
29+$TS_CMD_IPCS -q -c | grep -A 1 "^---" >> $TS_OUTPUT
30 $TS_CMD_IPCS -q -l | grep "^---" >> $TS_OUTPUT
31 $TS_CMD_IPCS -q -u | grep "^---" >> $TS_OUTPUT
32 echo >> $TS_OUTPUT
33
34 ts_log "test: sem headers"
35-$TS_CMD_IPCS -s -t | grep --after-context=1 "^---" >> $TS_OUTPUT
36-$TS_CMD_IPCS -s -p | grep --after-context=1 "^---" >> $TS_OUTPUT
37-$TS_CMD_IPCS -s -c | grep --after-context=1 "^---" >> $TS_OUTPUT
38+$TS_CMD_IPCS -s -t | grep -A 1 "^---" >> $TS_OUTPUT
39+$TS_CMD_IPCS -s -p | grep -A 1 "^---" >> $TS_OUTPUT
40+$TS_CMD_IPCS -s -c | grep -A 1 "^---" >> $TS_OUTPUT
41 $TS_CMD_IPCS -s -l | grep "^---" >> $TS_OUTPUT
42 $TS_CMD_IPCS -s -u | grep "^---" >> $TS_OUTPUT
43 echo >> $TS_OUTPUT
44
45 ts_log "test: all headers"
46-$TS_CMD_IPCS -a | grep --after-context=1 "^---" >> $TS_OUTPUT
47+$TS_CMD_IPCS -a | grep -A 1 "^---" >> $TS_OUTPUT
48
49-$TS_CMD_IPCS -a -t | grep --after-context=1 "^---" >> $TS_OUTPUT
50-$TS_CMD_IPCS -a -p | grep --after-context=1 "^---" >> $TS_OUTPUT
51-$TS_CMD_IPCS -a -c | grep --after-context=1 "^---" >> $TS_OUTPUT
52+$TS_CMD_IPCS -a -t | grep -A 1 "^---" >> $TS_OUTPUT
53+$TS_CMD_IPCS -a -p | grep -A 1 "^---" >> $TS_OUTPUT
54+$TS_CMD_IPCS -a -c | grep -A 1 "^---" >> $TS_OUTPUT
55 $TS_CMD_IPCS -a -l | grep "^---" >> $TS_OUTPUT
56 $TS_CMD_IPCS -a -u | grep "^---" >> $TS_OUTPUT
57
diff --git a/meta/recipes-core/util-linux/util-linux/avoid_unsupported_sleep_param.patch b/meta/recipes-core/util-linux/util-linux/avoid_unsupported_sleep_param.patch
deleted file mode 100644
index 7a63a4e05d..0000000000
--- a/meta/recipes-core/util-linux/util-linux/avoid_unsupported_sleep_param.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Avoid unsupported sleep parameter
2
3Signed-off-by: Tudor Florea <tudor.florea@enea.com>
4Upstream-Status: Pending
5
6diff -ruN a/simple b/simple
7--- a/tests/ts/tailf/simple 2015-11-12 11:34:49.971817130 +0200
8+++ b/tests/ts/tailf/simple 2013-11-12 11:34:37.876325128 +0200
9@@ -27,9 +27,9 @@
10
11 $TS_CMD_TAILF $INPUT > $TS_OUTPUT 2>&1 &
12
13-sleep 0.5
14+sleep 1
15 echo {0..9} >> $INPUT
16-sleep 0.5
17+sleep 1
18
19 rm -f $INPUT
20
diff --git a/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch b/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch
index 0eb8810855..417ca1d98f 100644
--- a/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch
+++ b/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch
@@ -3,16 +3,23 @@ Display testname for subtest
3Signed-off-by: Tudor Florea <tudor.florea@enea.com> 3Signed-off-by: Tudor Florea <tudor.florea@enea.com>
4Upstream-Status: Pending 4Upstream-Status: Pending
5 5
6diff -ruN a/functions.sh b/functions.sh 6---
7--- a/tests/functions.sh 2015-11-12 21:32:02.434542124 +0100 7 tests/functions.sh | 2 +-
8+++ b/tests/functions.sh 2015-11-12 21:40:37.095317280 +0100 8 1 file changed, 1 insertion(+), 1 deletion(-)
9@@ -297,7 +297,7 @@ 9
10 if [ "$TS_PARALLEL" == "yes" ]; then 10diff --git a/tests/functions.sh b/tests/functions.sh
11 TS_TITLE=$(printf "%13s: %-30s ...\n%16s: %-27s ..." "$TS_COMPONENT" "$TS_DESC" "" "$TS_SUBNAME") 11index 5246605..b24dc15 100644
12 else 12--- a/tests/functions.sh
13- TS_TITLE=$(printf "%16s: %-27s ..." "" "$TS_SUBNAME") 13+++ b/tests/functions.sh
14+ TS_TITLE=$(printf "%13s: %-30s ..." "$TS_COMPONENT" "$TS_SUBNAME") 14@@ -320,7 +320,7 @@ function ts_init_subtest {
15 echo -n "$TS_TITLE" 15
16 if [ "$TS_PARSABLE" != "yes" ]; then
17 [ $TS_NSUBTESTS -eq 1 ] && echo
18- printf "%16s: %-27s ..." "" "$TS_SUBNAME"
19+ printf "%13s: %-30s ..." "$TS_COMPONENT" "$TS_SUBNAME"
16 fi 20 fi
17 } 21 }
22
23--
242.8.3
18 25
diff --git a/meta/recipes-core/util-linux/util-linux/ptest.patch b/meta/recipes-core/util-linux/util-linux/ptest.patch
index 837f189341..0537f7d856 100644
--- a/meta/recipes-core/util-linux/util-linux/ptest.patch
+++ b/meta/recipes-core/util-linux/util-linux/ptest.patch
@@ -2,16 +2,22 @@ Define TESTS variable
2 2
3Signed-off-by: Tudor Florea <tudor.florea@enea.com> 3Signed-off-by: Tudor Florea <tudor.florea@enea.com>
4Upstream-Status: Pending 4Upstream-Status: Pending
5---
6 Makefile.am | 1 +
7 1 file changed, 1 insertion(+)
5 8
6diff -ruN a/Makefile.am b/Makefile.am 9diff --git a/Makefile.am b/Makefile.am
7--- a/Makefile.am 2015-11-12 20:29:46.778396936 +0100 10index bbaccb1..7d5a6bb 100644
8+++ b/Makefile.am 2015-11-12 20:32:24.342450279 +0100 11--- a/Makefile.am
9@@ -48,7 +48,7 @@ 12+++ b/Makefile.am
13@@ -48,6 +48,7 @@ systemdsystemunit_DATA =
10 dist_bashcompletion_DATA = 14 dist_bashcompletion_DATA =
11 check_PROGRAMS = 15 check_PROGRAMS =
12 dist_check_SCRIPTS = 16 dist_check_SCRIPTS =
13-TESTS =
14+TESTS = $(check_PROGRAMS) 17+TESTS = $(check_PROGRAMS)
15 18
16 PATHFILES = 19 PATHFILES =
20
21--
222.8.3
17 23
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
deleted file mode 100644
index 1f496dee21..0000000000
--- a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1Support older hosts with latest util-linux-native
2
3mkostemp is not defined on older machines. So we detect this and
4provide a define that uses mkstemp instead.
5
6O_CLOEXEC is not defined on older machines. It is however defined
7in the 'c.h' header. Fix up the users to include 'c.h'.
8
9fdisks/fdisksunlabel.c was modified to use qsort_r, however
10this is not defined on older hosts. Revert:
11 commit c69bbca9c1f6645097bd20fe3a21f5a99a2a0698
12 fdisk: (sun): use ask API, remove global variable
13
14Upstream-Status: Inappropriate [other]
15Patches revert upstream changes in order to support older
16machines.
17
18Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
19Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
20---
21 configure.ac | 1 +
22 include/c.h | 7 +++++++
23 2 files changed, 8 insertions(+)
24
25diff --git a/configure.ac b/configure.ac
26index eb3680b..93e015f 100644
27--- a/configure.ac
28+++ b/configure.ac
29@@ -318,6 +318,7 @@ AC_CHECK_FUNCS([ \
30 llseek \
31 lseek64 \
32 mempcpy \
33+ mkostemp \
34 nanosleep \
35 open_memstream \
36 personality \
37diff --git a/include/c.h b/include/c.h
38index e423e8b..cf33b94 100644
39--- a/include/c.h
40+++ b/include/c.h
41@@ -233,6 +233,13 @@ static inline int dirfd(DIR *d)
42 #endif
43
44 /*
45+ * mkostemp replacement
46+ */
47+#ifndef HAVE_MKOSTEMP
48+#define mkostemp(template, flags) mkstemp(template)
49+#endif
50+
51+/*
52 * MAXHOSTNAMELEN replacement
53 */
54 static inline size_t get_hostname_max(void)
55--
561.9.1
57
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch
deleted file mode 100644
index 5773d7ea1b..0000000000
--- a/meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3The FHS indicates that /etc must be capable of being mounted R/O.
4
5The FHS also indicates that lock files belong in /var/lock, and /var must
6be R/W as soon as possible during boot.
7
8This patch moves the mtab lock file from the potentially R/O /etc, to the
9R/W /var/lock area. This lock file is used when mounting disks and making
10other mount adjustments. The _PATH_MOUNTED_TMP is not adjusted, as failing
11to write to this file does not cause any functional limitations.
12
13(Note, if /etc is R/O, then /etc/mtab should be a symlink to /proc/mounts)
14
15Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
16
17--- util-linux-ng-2.16/include/pathnames.h.orig
18+++ util-linux-ng-2.16/include/pathnames.h
19@@ -90,7 +90,7 @@
20 # endif
21 #endif
22
23-#define _PATH_MOUNTED_LOCK _PATH_MOUNTED "~"
24+#define _PATH_MOUNTED_LOCK "/var/lock/mtab~"
25 #define _PATH_MOUNTED_TMP _PATH_MOUNTED ".tmp"
26
27 #ifndef _PATH_DEV
diff --git a/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch b/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch
index 1b0ff79d42..a6fde5d9cb 100644
--- a/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch
+++ b/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch
@@ -3,19 +3,23 @@ This patch adds error() API implementation for non-glibc system C libs
3Upstream-Status: Pending 3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com> 4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5 5
6Index: util-linux-2.27.1/tests/helpers/test_uuidd.c 6---
7=================================================================== 7 misc-utils/test_uuidd.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++-
8--- util-linux-2.27.1.orig/tests/helpers/test_uuidd.c 8 1 file changed, 61 insertions(+), 1 deletion(-)
9+++ util-linux-2.27.1/tests/helpers/test_uuidd.c 9
10diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c
11index 36f3b3d..7d579ce 100644
12--- a/misc-utils/test_uuidd.c
13+++ b/misc-utils/test_uuidd.c
10@@ -23,7 +23,6 @@ 14@@ -23,7 +23,6 @@
11 * 15 *
12 * make uuidd uuidgen localstatedir=/var 16 * make uuidd uuidgen localstatedir=/var
13 */ 17 */
14-#include <error.h> 18-#include <error.h>
15 #include <libgen.h>
16 #include <pthread.h> 19 #include <pthread.h>
17 #include <stdio.h> 20 #include <stdio.h>
18@@ -39,6 +38,17 @@ 21 #include <stdlib.h>
22@@ -38,6 +37,17 @@
19 #include "xalloc.h" 23 #include "xalloc.h"
20 #include "strutils.h" 24 #include "strutils.h"
21 25
@@ -33,7 +37,7 @@ Index: util-linux-2.27.1/tests/helpers/test_uuidd.c
33 #define LOG(level,args) if (loglev >= level) { fprintf args; } 37 #define LOG(level,args) if (loglev >= level) { fprintf args; }
34 38
35 size_t nprocesses = 4; 39 size_t nprocesses = 4;
36@@ -257,6 +267,56 @@ static void object_dump(size_t idx, obje 40@@ -256,6 +266,56 @@ static void object_dump(size_t idx, object_t *obj)
37 fprintf(stderr, "}\n"); 41 fprintf(stderr, "}\n");
38 } 42 }
39 43
@@ -90,3 +94,6 @@ Index: util-linux-2.27.1/tests/helpers/test_uuidd.c
90 int main(int argc, char *argv[]) 94 int main(int argc, char *argv[])
91 { 95 {
92 size_t i, nfailed = 0, nignored = 0; 96 size_t i, nfailed = 0, nignored = 0;
97--
982.8.3
99
diff --git a/meta/recipes-core/util-linux/util-linux_2.27.1.bb b/meta/recipes-core/util-linux/util-linux_2.28.bb
index 7549158317..27fa88b50c 100644
--- a/meta/recipes-core/util-linux/util-linux_2.27.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.28.bb
@@ -1,28 +1,23 @@
1MAJOR_VERSION = "2.27" 1MAJOR_VERSION = "2.28"
2require util-linux.inc 2require util-linux.inc
3 3
4# To support older hosts, we need to patch and/or revert 4# To support older hosts, we need to patch and/or revert
5# some upstream changes. Only do this for native packages. 5# some upstream changes. Only do this for native packages.
6OLDHOST = "" 6OLDHOST = ""
7OLDHOST_class-native = "file://util-linux-native.patch \ 7OLDHOST_class-native = "file://util-linux-native-qsort.patch"
8 file://util-linux-native-qsort.patch \
9 "
10 8
11SRC_URI += "file://util-linux-ng-2.16-mount_lock_path.patch \ 9SRC_URI += "file://configure-sbindir.patch \
12 file://configure-sbindir.patch \
13 file://runuser.pamd \ 10 file://runuser.pamd \
14 file://runuser-l.pamd \ 11 file://runuser-l.pamd \
15 ${OLDHOST} \ 12 ${OLDHOST} \
16 file://ptest.patch \ 13 file://ptest.patch \
17 file://run-ptest \ 14 file://run-ptest \
18 file://avoid_unsupported_sleep_param.patch \
19 file://avoid_unsupported_grep_opts.patch \
20 file://display_testname_for_subtest.patch \ 15 file://display_testname_for_subtest.patch \
21 file://avoid_parallel_tests.patch \ 16 file://avoid_parallel_tests.patch \
22 file://uuid-test-error-api.patch \ 17 file://uuid-test-error-api.patch \
23" 18"
24SRC_URI[md5sum] = "3cd2698d1363a2c64091c2dadc974647" 19SRC_URI[md5sum] = "e534e6ccc49107e5d31c329af798ef7d"
25SRC_URI[sha256sum] = "0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290" 20SRC_URI[sha256sum] = "395847e2a18a2c317170f238892751e73a57104565344f8644090c8b091014bb"
26 21
27CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" 22CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
28 23