From 030854f301fc124e4913c95c86a1a8cdd4d97b4e Mon Sep 17 00:00:00 2001 From: Yunlong Xiao Date: Fri, 8 Jul 2022 16:38:58 +0800 Subject: [PATCH] fix build error --- .../systemd/0025-fix_missing_define.patch | 63 ++++++++++++ .../recipes-core/systemd/systemd_300.bb | 1 + .../util-linux/avoid_parallel_tests.patch | 19 ---- .../util-linux/configure-sbindir.patch | 23 ----- .../display_testname_for_subtest.patch | 25 ----- .../util-linux/util-linux/ptest.patch | 23 ----- .../util-linux/util-linux/run-ptest | 25 ----- .../util-linux/util-linux/runuser-l.pamd | 3 - .../util-linux/util-linux/runuser.pamd | 4 - .../util-linux/util-linux-native-qsort.patch | 33 ------- .../util-linux/uuid-test-error-api.patch | 99 ------------------- .../bash-completion/bash-completion_2.4.bb | 2 +- 12 files changed, 65 insertions(+), 255 deletions(-) create mode 100644 meta/meta-mediatek-aud/recipes-core/systemd/systemd/0025-fix_missing_define.patch delete mode 100644 meta/poky/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch delete mode 100644 meta/poky/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch delete mode 100644 meta/poky/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch delete mode 100644 meta/poky/meta/recipes-core/util-linux/util-linux/ptest.patch delete mode 100644 meta/poky/meta/recipes-core/util-linux/util-linux/run-ptest delete mode 100644 meta/poky/meta/recipes-core/util-linux/util-linux/runuser-l.pamd delete mode 100644 meta/poky/meta/recipes-core/util-linux/util-linux/runuser.pamd delete mode 100644 meta/poky/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch delete mode 100644 meta/poky/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch diff --git a/meta/meta-mediatek-aud/recipes-core/systemd/systemd/0025-fix_missing_define.patch b/meta/meta-mediatek-aud/recipes-core/systemd/systemd/0025-fix_missing_define.patch new file mode 100644 index 000000000..43f81219e --- /dev/null +++ b/meta/meta-mediatek-aud/recipes-core/systemd/systemd/0025-fix_missing_define.patch @@ -0,0 +1,63 @@ +From eb50b6d936c474f5bc2974c059f6432222af4de4 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 22 Mar 2018 12:50:45 +0100 +Subject: [PATCH] Fix linux/fs.h and sys/mount.h collisions + +* (kernel-headers) linux/fs.h and (glibc) sys/mount.h contains MS_* constants + and because it's without #ifdefs you cannot include the both files together + in the same code + +* (systemd) src/basic/missing.h contains another copy of MS_* constants + +The patch removes local systemd MS_* fallbacks, cleanup fs.h and +mount.h include. + +Signed-off-by: Karel Zak +--- + src/basic/missing.h | 40 ---------------------------------------- + 1 files changed, 0 insertions(+), 40 deletions(-) + +diff --git a/src/basic/missing.h b/src/basic/missing.h +index 567aea8da9c..6802dd27c7b 100644 +--- a/src/basic/missing.h ++++ b/src/basic/missing.h +@@ -520,13 +520,9 @@ struct btrfs_ioctl_quota_ctl_args { + #define TMPFS_MAGIC 0x01021994 + #endif + +-#ifndef MS_MOVE +-#define MS_MOVE 8192 +-#endif + +-#ifndef MS_PRIVATE +-#define MS_PRIVATE (1 << 18) +-#endif ++ ++ + + #if !HAVE_DECL_GETTID + static inline pid_t gettid(void) { +@@ -538,17 +534,11 @@ static inline pid_t gettid(void) { + #define SCM_SECURITY 0x03 + #endif + +-#ifndef MS_STRICTATIME +-#define MS_STRICTATIME (1<<24) +-#endif + +-#ifndef MS_REC +-#define MS_REC 16384 +-#endif + +-#ifndef MS_SHARED +-#define MS_SHARED (1<<20) +-#endif ++ ++ ++ + + #ifndef PR_SET_NO_NEW_PRIVS + #define PR_SET_NO_NEW_PRIVS 38 +================================================================ + +--- gitweb: diff --git a/meta/meta-mediatek-aud/recipes-core/systemd/systemd_300.bb b/meta/meta-mediatek-aud/recipes-core/systemd/systemd_300.bb index a69328224..6cb79e688 100644 --- a/meta/meta-mediatek-aud/recipes-core/systemd/systemd_300.bb +++ b/meta/meta-mediatek-aud/recipes-core/systemd/systemd_300.bb @@ -56,6 +56,7 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ file://0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \ file://0023-build-sys-fix-build-with-libgrcypt-disabled.patch \ file://0024-patch-for-mount-usrdata.patch \ + file://0025-fix_missing_define.patch \ " SRC_URI_append_libc-uclibc = "\ file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \ diff --git a/meta/poky/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch b/meta/poky/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch deleted file mode 100644 index 46d4d3765..000000000 --- a/meta/poky/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Ptest needs buildtest-TESTS and runtest-TESTS targets. -serial-tests is required to generate those targets. -Revert run.sh script accordingly to serialize running tests - -Signed-off-by: Tudor Florea -Upstream-Status: Inappropriate - -diff -ruN a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-27 12:37:42.119772658 +0200 -+++ b/configure.ac 2014-05-27 12:41:46.225573272 +0200 -@@ -10,7 +10,7 @@ - dnl AC_USE_SYSTEM_EXTENSIONS must be called before any macros that run - dnl the compiler (like AC_PROG_LIBTOOL) to avoid autoconf errors. - AC_USE_SYSTEM_EXTENSIONS --AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax dist-bzip2 no-dist-gzip dist-xz -Wno-portability subdir-objects]) -+AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax dist-bzip2 no-dist-gzip dist-xz -Wno-portability subdir-objects serial-tests]) - - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], - [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) diff --git a/meta/poky/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta/poky/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch deleted file mode 100644 index a5b1ff12e..000000000 --- a/meta/poky/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +++ /dev/null @@ -1,23 +0,0 @@ -util-linux: take ${sbindir} from the environment if it is set there -fix the test, the [ ] syntax was getting eaten by autoconf - -Signed-off-by: Phil Blundell -Signed-off-by: Saul Wold -Upstream-Status: Pending - ---- - tests/functions.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/functions.sh b/tests/functions.sh -index 5246605..b24dc15 100644 ---- a/tests/functions.sh -+++ b/tests/functions.sh -@@ -320,7 +320,7 @@ function ts_init_subtest { - - if [ "$TS_PARSABLE" != "yes" ]; then - [ $TS_NSUBTESTS -eq 1 ] && echo -- printf "%16s: %-27s ..." "" "$TS_SUBNAME" -+ printf "%13s: %-30s ..." "$TS_COMPONENT" "$TS_SUBNAME" - fi - } - --- -2.8.3 - diff --git a/meta/poky/meta/recipes-core/util-linux/util-linux/ptest.patch b/meta/poky/meta/recipes-core/util-linux/util-linux/ptest.patch deleted file mode 100644 index 0537f7d85..000000000 --- a/meta/poky/meta/recipes-core/util-linux/util-linux/ptest.patch +++ /dev/null @@ -1,23 +0,0 @@ -Define TESTS variable - -Signed-off-by: Tudor Florea -Upstream-Status: Pending ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index bbaccb1..7d5a6bb 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -48,6 +48,7 @@ systemdsystemunit_DATA = - dist_bashcompletion_DATA = - check_PROGRAMS = - dist_check_SCRIPTS = -+TESTS = $(check_PROGRAMS) - - PATHFILES = - --- -2.8.3 - diff --git a/meta/poky/meta/recipes-core/util-linux/util-linux/run-ptest b/meta/poky/meta/recipes-core/util-linux/util-linux/run-ptest deleted file mode 100644 index fbc2f9b56..000000000 --- a/meta/poky/meta/recipes-core/util-linux/util-linux/run-ptest +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -cd tests || exit 1 - -comps=$(find ts/ -type f -perm -111 -regex ".*/[^\.~]*" | sort) - - -echo -echo "-------------------- util-linux regression tests --------------------" -echo -echo " For development purpose only. " -echo " Don't execute on production system! " -echo - -res=0 -count=0 -for ts in $comps; -do - $ts | sed '{ - s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/ - s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/ - s/^\(.*\):\(.*\) \.\.\. SKIPPED \(.*\)$/SKIP: \1:\2 \3/ - }' -done - diff --git a/meta/poky/meta/recipes-core/util-linux/util-linux/runuser-l.pamd b/meta/poky/meta/recipes-core/util-linux/util-linux/runuser-l.pamd deleted file mode 100644 index 4b368ccf5..000000000 --- a/meta/poky/meta/recipes-core/util-linux/util-linux/runuser-l.pamd +++ /dev/null @@ -1,3 +0,0 @@ -auth include runuser -session optional pam_keyinit.so force revoke -session include runuser diff --git a/meta/poky/meta/recipes-core/util-linux/util-linux/runuser.pamd b/meta/poky/meta/recipes-core/util-linux/util-linux/runuser.pamd deleted file mode 100644 index 48d133b9e..000000000 --- a/meta/poky/meta/recipes-core/util-linux/util-linux/runuser.pamd +++ /dev/null @@ -1,4 +0,0 @@ -auth sufficient pam_rootok.so -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/meta/poky/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/meta/poky/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch deleted file mode 100644 index 68bf22de8..000000000 --- a/meta/poky/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f220d809be1baa654503bf6ff52f3630b0d7015c Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Wed, 26 Mar 2014 01:30:29 +0000 -Subject: [PATCH] sun.c: use qsort() to instead of qsort_r() - -qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on -the host like CentOS 5.x. - -Upstream-Status: Inappropriate [Other] - -Signed-off-by: Robert Yang ---- - libfdisk/src/sun.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -Index: util-linux-2.24.2/libfdisk/src/sun.c -=================================================================== ---- util-linux-2.24.2.orig/libfdisk/src/sun.c -+++ util-linux-2.24.2/libfdisk/src/sun.c -@@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f - } - verify_sun_starts = starts; - -- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), -- (int (*)(const void *,const void *,void *)) verify_sun_cmp, -- verify_sun_starts); -- -+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), -+ (int (*)(const void *,const void *)) verify_sun_cmp); -+ - if (array[0] == -1) { - fdisk_info(cxt, _("No partitions defined.")); - return 0; diff --git a/meta/poky/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch b/meta/poky/meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch deleted file mode 100644 index a6fde5d9c..000000000 --- a/meta/poky/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/poky/meta/recipes-support/bash-completion/bash-completion_2.4.bb b/meta/poky/meta/recipes-support/bash-completion/bash-completion_2.4.bb index 42719f143..d2f531158 100644 --- a/meta/poky/meta/recipes-support/bash-completion/bash-completion_2.4.bb +++ b/meta/poky/meta/recipes-support/bash-completion/bash-completion_2.4.bb @@ -25,7 +25,7 @@ do_install_append() { # Delete files already provided by util-linux local i - for i in mount umount; do + for i in mount umount rfkill; do rm ${D}${datadir}/${BPN}/completions/$i done }