From 6b69e08cf60abbc40236cc3894b9783d720a6e6d Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 13 Jun 2017 12:51:52 -0400 Subject: util-linux: upgrade to 2.30 Drop uuid-test-error-api.patch as it's been fixed upstream differently: https://github.com/karelzak/util-linux/commit/b770b487004778f4425639c7ed1bb6ca22d157bf Drop ptest for tailf, as it got deprecated and removed: https://github.com/karelzak/util-linux/commit/70ca1a77721b41f2355eeb00d4e55e13dba3e313 Signed-off-by: Denys Dmytriyenko Signed-off-by: Ross Burton --- meta/recipes-core/util-linux/util-linux.inc | 2 +- .../util-linux/uuid-test-error-api.patch | 99 ---------------------- meta/recipes-core/util-linux/util-linux_2.29.2.bb | 31 ------- meta/recipes-core/util-linux/util-linux_2.30.bb | 30 +++++++ 4 files changed, 31 insertions(+), 131 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch delete mode 100644 meta/recipes-core/util-linux/util-linux_2.29.2.bb create mode 100644 meta/recipes-core/util-linux/util-linux_2.30.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 63302a9fe1..1656e92a87 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -304,7 +304,7 @@ do_install_ptest() { cp ${S}/tests/run.sh ${D}${PTEST_PATH}/tests/ cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected - list="bitops build-sys cal col colrm column dmesg fsck hexdump hwclock ipcs isosize login look md5 misc more namei paths schedutils script swapon tailf" + list="bitops build-sys cal col colrm column dmesg fsck hexdump hwclock ipcs isosize login look md5 misc more namei paths schedutils script swapon" # The following tests are not installed yet: # blkid scsi_debug module dependent # cramfs gcc dependent 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 deleted file mode 100644 index a6fde5d9cb..0000000000 --- a/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch +++ /dev/null @@ -1,99 +0,0 @@ -This patch adds error() API implementation for non-glibc system C libs - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - misc-utils/test_uuidd.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 61 insertions(+), 1 deletion(-) - -diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c -index 36f3b3d..7d579ce 100644 ---- a/misc-utils/test_uuidd.c -+++ b/misc-utils/test_uuidd.c -@@ -23,7 +23,6 @@ - * - * make uuidd uuidgen localstatedir=/var - */ --#include - #include - #include - #include -@@ -38,6 +37,17 @@ - #include "xalloc.h" - #include "strutils.h" - -+#ifdef __GLIBC__ -+#include -+#else -+extern void (*error_print_progname)(void); -+extern unsigned int error_message_count; -+extern int error_one_per_line; -+ -+void error(int, int, const char *, ...); -+void error_at_line(int, int, const char *, unsigned int, const char *, ...); -+#endif -+ - #define LOG(level,args) if (loglev >= level) { fprintf args; } - - size_t nprocesses = 4; -@@ -256,6 +266,56 @@ static void object_dump(size_t idx, object_t *obj) - fprintf(stderr, "}\n"); - } - -+#ifndef __GLIBC__ -+extern char *__progname; -+ -+void (*error_print_progname)(void) = 0; -+unsigned int error_message_count = 0; -+int error_one_per_line = 0; -+ -+static void eprint(int status, int e, const char *file, unsigned int line, const char *fmt, va_list ap) -+{ -+ if (file && error_one_per_line) { -+ static const char *oldfile; -+ static unsigned int oldline; -+ if (line == oldline && strcmp(file, oldfile) == 0) -+ return; -+ oldfile = file; -+ oldline = line; -+ } -+ if (error_print_progname) -+ error_print_progname(); -+ else -+ fprintf(stderr, "%s: ", __progname); -+ if (file) -+ fprintf(stderr, "%s:%u: ", file, line); -+ vfprintf(stderr, fmt, ap); -+ if (e) -+ fprintf(stderr, ": %s", strerror(e)); -+ putc('\n', stderr); -+ fflush(stderr); -+ error_message_count++; -+ if (status) -+ exit(status); -+} -+ -+void error(int status, int e, const char *fmt, ...) -+{ -+ va_list ap; -+ va_start(ap,fmt); -+ eprint(status, e, 0, 0, fmt, ap); -+ va_end(ap); -+} -+ -+void error_at_line(int status, int e, const char *file, unsigned int line, const char *fmt, ...) -+{ -+ va_list ap; -+ va_start(ap,fmt); -+ eprint(status, e, file, line, fmt, ap); -+ va_end(ap); -+} -+#endif /* __GLIBC__ */ -+ - int main(int argc, char *argv[]) - { - size_t i, nfailed = 0, nignored = 0; --- -2.8.3 - diff --git a/meta/recipes-core/util-linux/util-linux_2.29.2.bb b/meta/recipes-core/util-linux/util-linux_2.29.2.bb deleted file mode 100644 index 11303f8ddf..0000000000 --- a/meta/recipes-core/util-linux/util-linux_2.29.2.bb +++ /dev/null @@ -1,31 +0,0 @@ -MAJOR_VERSION = "2.29" -require util-linux.inc - -# To support older hosts, we need to patch and/or revert -# some upstream changes. Only do this for native packages. -OLDHOST = "" -OLDHOST_class-native = "file://util-linux-native-qsort.patch" - -SRC_URI += "file://configure-sbindir.patch \ - file://runuser.pamd \ - file://runuser-l.pamd \ - ${OLDHOST} \ - file://ptest.patch \ - file://run-ptest \ - file://display_testname_for_subtest.patch \ - file://avoid_parallel_tests.patch \ - file://uuid-test-error-api.patch \ -" -SRC_URI[md5sum] = "63c40c2068fcbb7e1d5c1d281115d973" -SRC_URI[sha256sum] = "accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3" - -CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" - -EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ - --disable-fallocate \ - --disable-use-tty-group \ -" -EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \ - --disable-fallocate \ - --disable-use-tty-group \ -" diff --git a/meta/recipes-core/util-linux/util-linux_2.30.bb b/meta/recipes-core/util-linux/util-linux_2.30.bb new file mode 100644 index 0000000000..6b309b555f --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.30.bb @@ -0,0 +1,30 @@ +MAJOR_VERSION = "2.30" +require util-linux.inc + +# To support older hosts, we need to patch and/or revert +# some upstream changes. Only do this for native packages. +OLDHOST = "" +OLDHOST_class-native = "file://util-linux-native-qsort.patch" + +SRC_URI += "file://configure-sbindir.patch \ + file://runuser.pamd \ + file://runuser-l.pamd \ + ${OLDHOST} \ + file://ptest.patch \ + file://run-ptest \ + file://display_testname_for_subtest.patch \ + file://avoid_parallel_tests.patch \ +" +SRC_URI[md5sum] = "eaa3429150268027908a1b8ae6ee9a62" +SRC_URI[sha256sum] = "c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d" + +CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" + +EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ + --disable-fallocate \ + --disable-use-tty-group \ +" +EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \ + --disable-fallocate \ + --disable-use-tty-group \ +" -- cgit 1.2.3-korg