diff options
author | Denys Dmytriyenko <denys@ti.com> | 2017-06-13 12:51:52 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-23 11:43:38 +0100 |
commit | 6b69e08cf60abbc40236cc3894b9783d720a6e6d (patch) | |
tree | c6f6c22e8dc1300e0be96d9ae364193c3b47b0e0 /meta/recipes-core/util-linux/util-linux | |
parent | 2589cfb8a5b46be958ff3ee228c3a32f82dada86 (diff) | |
download | openembedded-core-contrib-6b69e08cf60abbc40236cc3894b9783d720a6e6d.tar.gz |
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 <denys@ti.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch | 99 |
1 files changed, 0 insertions, 99 deletions
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 <raj.khem@gmail.com> - ---- - 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 <error.h> - #include <pthread.h> - #include <stdio.h> - #include <stdlib.h> -@@ -38,6 +37,17 @@ - #include "xalloc.h" - #include "strutils.h" - -+#ifdef __GLIBC__ -+#include <error.h> -+#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 - |