mirror of
https://git.yoctoproject.org/poky
synced 2026-03-19 13:49:41 +01:00
util-linux: upgrade to 2.30
Drop uuid-test-error-api.patch as it's been fixed upstream differently:b770b48700Drop ptest for tailf, as it got deprecated and removed:70ca1a7772(From OE-Core rev: 6b69e08cf60abbc40236cc3894b9783d720a6e6d) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
21f93730e2
commit
953e61870e
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
MAJOR_VERSION = "2.29"
|
||||
MAJOR_VERSION = "2.30"
|
||||
require util-linux.inc
|
||||
|
||||
# To support older hosts, we need to patch and/or revert
|
||||
@@ -14,10 +14,9 @@ SRC_URI += "file://configure-sbindir.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"
|
||||
SRC_URI[md5sum] = "eaa3429150268027908a1b8ae6ee9a62"
|
||||
SRC_URI[sha256sum] = "c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d"
|
||||
|
||||
CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
|
||||
|
||||
Reference in New Issue
Block a user