systemd: upgrade from 255.6 to 256
Subsystems (2)
PATCH 1/4 systemd: upgrade from 255.6 to 256
From: Chen Qi <[email protected]>
The 'cgroupv2' PACKAGECONFIG is dropped as systemd now only supports cgroupv2.
mime is now inherited because ${datadir}/mime/packages/io.systemd.xml is a mime type file.
For musl specific patches, most are refreshed. One old patch is dropped, and three new ones are added.
Newly added:
build-path.c: avoid boot time segfault for musl
adjust header inclusion order to avoid redeclaration
undef stdin for references using stdin as a struct member include signal.h to avoid the 'undeclared' error
Dropped:
src/basic/missing.h: check for missing strndupa
(drop reason: systemd does not use strndupa any more)
---
meta/recipes-core/systemd/systemd.inc | 4 +-
...all-dependency-links-at-install-tim.patch} | 21 +-
...mplment-systemd-sysv-install-for-OE.patch} | 7 +-
...agate-sysroot-for-cross-compilation.patch} | 10 +-
...missing.h-check-for-missing-strndupa.patch | 696 ------------------
...-missing_type.h-add-comparison_fn_t.patch} | 15 +-
...-parse_printf_format-implementation.patch} | 25 +-
...B_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} | 22 +-
...07-add-missing-FTW_-macros-for-musl.patch} | 9 +-
...8-Use-uintmax_t-for-handling-rlim_t.patch} | 23 +-
..._SYMLINK_NOFOLLOW-flag-to-faccessat.patch} | 9 +-
...atible-basename-for-non-glibc-syste.patch} | 10 +-
...ffering-when-writing-to-oom_score_a.patch} | 11 +-
...ompliant-strerror_r-from-GNU-specif.patch} | 9 +-
...efinition-of-prctl_mm_map-structure.patch} | 13 +-
...not-disable-buffer-in-writing-files.patch} | 151 ++--
...tch => 0015-Handle-__cpu_mask-usage.patch} | 9 +-
...atch => 0016-Handle-missing-gshadow.patch} | 50 +-
....h-Define-MIPS-ABI-defines-for-musl.patch} | 7 +-
...ss-correct-parameters-to-getdents64.patch} | 11 +-
...tch => 0019-Adjust-for-musl-headers.patch} | 165 ++---
...rerror-is-assumed-to-be-GNU-specifi.patch} | 13 +-
...til-Make-STRERROR-portable-for-musl.patch} | 9 +-
...ke-malloc_trim-conditional-on-glibc.patch} | 13 +-
...ared-Do-not-use-malloc_info-on-musl.patch} | 11 +-
...4-avoid-missing-LOCK_EX-declaration.patch} | 24 +-
...gnal.h-to-avoid-the-undeclared-error.patch | 27 +
...references-using-stdin-as-a-struct-m.patch | 48 ++
...clusion-order-to-avoid-redeclaration.patch | 76 ++
....c-avoid-boot-time-segfault-for-musl.patch | 31 +
.../{systemd_255.6.bb => systemd_256.bb} | 60 +-
31 files changed, 563 insertions(+), 1026 deletions(-)
rename meta/recipes-core/systemd/systemd/{0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch => 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch} (85%)
rename meta/recipes-core/systemd/systemd/{0008-implment-systemd-sysv-install-for-OE.patch => 0002-implment-systemd-sysv-install-for-OE.patch} (91%)
rename meta/recipes-core/systemd/systemd/{0023-meson-bpf-propagate-sysroot-for-cross-compilation.patch => 0003-meson-bpf-propagate-sysroot-for-cross-compilation.patch} (78%)
delete mode 100644 meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
rename meta/recipes-core/systemd/systemd/{0001-missing_type.h-add-comparison_fn_t.patch => 0004-missing_type.h-add-comparison_fn_t.patch} (87%)
rename meta/recipes-core/systemd/systemd/{0002-add-fallback-parse_printf_format-implementation.patch => 0005-add-fallback-parse_printf_format-implementation.patch} (96%)
rename meta/recipes-core/systemd/systemd/{0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} (91%)
rename meta/recipes-core/systemd/systemd/{0005-add-missing-FTW_-macros-for-musl.patch => 0007-add-missing-FTW_-macros-for-musl.patch} (85%)
rename meta/recipes-core/systemd/systemd/{0006-Use-uintmax_t-for-handling-rlim_t.patch => 0008-Use-uintmax_t-for-handling-rlim_t.patch} (88%)
rename meta/recipes-core/systemd/systemd/{0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (96%)
rename meta/recipes-core/systemd/systemd/{0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch => 0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch} (82%)
rename meta/recipes-core/systemd/systemd/{0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch => 0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch} (82%)
rename meta/recipes-core/systemd/systemd/{0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch => 0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch} (92%)
rename meta/recipes-core/systemd/systemd/{0011-avoid-redefinition-of-prctl_mm_map-structure.patch => 0013-avoid-redefinition-of-prctl_mm_map-structure.patch} (71%)
rename meta/recipes-core/systemd/systemd/{0012-do-not-disable-buffer-in-writing-files.patch => 0014-do-not-disable-buffer-in-writing-files.patch} (84%)
rename meta/recipes-core/systemd/systemd/{0013-Handle-__cpu_mask-usage.patch => 0015-Handle-__cpu_mask-usage.patch} (91%)
rename meta/recipes-core/systemd/systemd/{0014-Handle-missing-gshadow.patch => 0016-Handle-missing-gshadow.patch} (80%)
rename meta/recipes-core/systemd/systemd/{0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch => 0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch} (89%)
rename meta/recipes-core/systemd/systemd/{0016-pass-correct-parameters-to-getdents64.patch => 0018-pass-correct-parameters-to-getdents64.patch} (88%)
rename meta/recipes-core/systemd/systemd/{0017-Adjust-for-musl-headers.patch => 0019-Adjust-for-musl-headers.patch} (84%)
rename meta/recipes-core/systemd/systemd/{0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch => 0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch} (87%)
rename meta/recipes-core/systemd/systemd/{0019-errno-util-Make-STRERROR-portable-for-musl.patch => 0021-errno-util-Make-STRERROR-portable-for-musl.patch} (88%)
rename meta/recipes-core/systemd/systemd/{0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch => 0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch} (76%)
rename meta/recipes-core/systemd/systemd/{0021-shared-Do-not-use-malloc_info-on-musl.patch => 0023-shared-Do-not-use-malloc_info-on-musl.patch} (86%)
rename meta/recipes-core/systemd/systemd/{0022-avoid-missing-LOCK_EX-declaration.patch => 0024-avoid-missing-LOCK_EX-declaration.patch} (62%)
create mode 100644 meta/recipes-core/systemd/systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch
create mode 100644 meta/recipes-core/systemd/systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch
create mode 100644 meta/recipes-core/systemd/systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch
create mode 100644 meta/recipes-core/systemd/systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch
rename meta/recipes-core/systemd/{systemd_255.6.bb => systemd_256.bb} (95%)meta/recipes-core/systemd/systemd.inc +2 -2
@@ -15,8 +15,8 @@ LICENSE:libsystemd = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "5810c25792d4268282dd3892af1a253b690423c9" -SRCBRANCH = "v255-stable" +SRCREV = "5c79cdec10a547a866764a66e1e14898112a00cd" +SRCBRANCH = "main" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" S = "${WORKDIR}/git"
meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch renamed from meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch +12 -9
@@ -1,8 +1,8 @@ -From 661a34c3de30d4ff4a2a62c9a0573c6ce55424e4 Mon Sep 17 00:00:00 2001 +From ca94c86736ca7917e6c50d09d6c6ba56ba139709 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Thu, 21 Feb 2019 16:23:24 +0800 -Subject: [PATCH] binfmt: Don't install dependency links at install time for - the binfmt services +Subject: [PATCH 01/27] binfmt: Don't install dependency links at install time + for the binfmt services use [Install] blocks so that they get created when the service is enabled like a traditional service.
@@ -25,10 +25,10 @@ Signed-off-by: Scott Murray <[email protected]> 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/units/meson.build b/units/meson.build -index e7bfb7f838..1d5ec4b178 100644 +index b231341a1f..b613a188a4 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -154,7 +154,6 @@ units = [ +@@ -156,7 +156,6 @@ units = [ { 'file' : 'proc-sys-fs-binfmt_misc.automount', 'conditions' : ['ENABLE_BINFMT'],
@@ -36,7 +36,7 @@ index e7bfb7f838..1d5ec4b178 100644 }, { 'file' : 'proc-sys-fs-binfmt_misc.mount', -@@ -251,7 +250,6 @@ units = [ +@@ -258,7 +257,6 @@ units = [ { 'file' : 'systemd-binfmt.service.in', 'conditions' : ['ENABLE_BINFMT'],
@@ -45,7 +45,7 @@ index e7bfb7f838..1d5ec4b178 100644 { 'file' : 'systemd-bless-boot.service.in', diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount -index 5d212015a5..6c2900ca77 100644 +index 7ec21e76c9..fee4d1345f 100644 --- a/units/proc-sys-fs-binfmt_misc.automount +++ b/units/proc-sys-fs-binfmt_misc.automount @@ -22,3 +22,6 @@ Before=shutdown.target
@@ -56,11 +56,11 @@ index 5d212015a5..6c2900ca77 100644 +[Install] +WantedBy=sysinit.target diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index 6861c76674..531e9fbd90 100644 +index 318bf8efc2..6ef684861d 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in @@ -14,6 +14,7 @@ Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html - Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems + Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no Conflicts=shutdown.target +Wants=proc-sys-fs-binfmt_misc.automount
@@ -74,3 +74,6 @@ index 6861c76674..531e9fbd90 100644 + +[Install] +WantedBy=sysinit.target +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0002-implment-systemd-sysv-install-for-OE.patch renamed from meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch +5 -2
@@ -1,7 +1,7 @@ -From 5f89867f2b15f9bd411564d04e660cdeedd370ca Mon Sep 17 00:00:00 2001 +From 40ae40de3db990a7e56694f24fc625b1b71a98f7 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 5 Sep 2015 06:31:47 +0000 -Subject: [PATCH] implment systemd-sysv-install for OE +Subject: [PATCH 02/27] implment systemd-sysv-install for OE Use update-rc.d for enabling/disabling and status command to check the status of the sysv service
@@ -38,3 +38,6 @@ index cb58d8243b..000bdf6165 100755 ;; *) usage ;; +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0003-meson-bpf-propagate-sysroot-for-cross-compilation.patch renamed from meta/recipes-core/systemd/systemd/0023-meson-bpf-propagate-sysroot-for-cross-compilation.patch +5 -5
@@ -1,7 +1,7 @@ -From 7463b382bcaf26aacc60b73f98f0262aa41db3ee Mon Sep 17 00:00:00 2001 +From bbceb4b339231124a0b004531b4b6838539432e6 Mon Sep 17 00:00:00 2001 From: Johannes Schneider <[email protected]> Date: Thu, 20 Jun 2024 12:32:18 +0200 -Subject: [PATCH] meson: bpf: propagate 'sysroot' for cross compilation +Subject: [PATCH 03/27] meson: bpf: propagate 'sysroot' for cross compilation During cross-compilation of systemd, the compiler used to build the bpf's needs to be pointed at the correct include searchpath. Which can be done by passing
@@ -15,10 +15,10 @@ Signed-off-by: Johannes Schneider <[email protected]> 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build -index 187e7b216d..15df058ab6 100644 +index ea4e12aa1c..52723bef09 100644 --- a/meson.build +++ b/meson.build -@@ -1691,6 +1691,7 @@ if conf.get('BPF_FRAMEWORK') == 1 +@@ -1739,6 +1739,7 @@ if conf.get('BPF_FRAMEWORK') == 1 '-ffile-prefix-map=', '-fdebug-prefix-map=', '-fmacro-prefix-map=',
@@ -27,5 +27,5 @@ index 187e7b216d..15df058ab6 100644 foreach opt : c_args -- -2.34.1 +2.45.1
meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch deleted +0 -696
696 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0004-missing_type.h-add-comparison_fn_t.patch renamed from meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch +9 -6
@@ -1,7 +1,7 @@ -From d4b0bb9c7651017985fdd75469f37c34ce2f2c50 Mon Sep 17 00:00:00 2001 +From 34b7e1ed3b9a896db6fad435fd141c385c7337d1 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH] missing_type.h: add comparison_fn_t +Subject: [PATCH 04/27] missing_type.h: add comparison_fn_t Make it work with musl where comparison_fn_t and is not provided.
@@ -21,12 +21,12 @@ Signed-off-by: Jiaqing Zhao <[email protected]> 3 files changed, 6 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index f6233090a9..6c0456349d 100644 +index 1d17705c35..fc33b76ec1 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -10,3 +10,7 @@ #if !HAVE_CHAR16_T - #define char16_t uint16_t + # define char16_t uint16_t #endif + +#ifndef __GLIBC__
@@ -45,10 +45,10 @@ index 9c818bd747..ef10c8be2c 100644 /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c -index ae91534198..7f67eea38b 100644 +index a0b673f65f..29dd2fee16 100644 --- a/src/libsystemd/sd-journal/catalog.c +++ b/src/libsystemd/sd-journal/catalog.c -@@ -28,6 +28,7 @@ +@@ -29,6 +29,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h"
@@ -56,3 +56,6 @@ index ae91534198..7f67eea38b 100644 const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0005-add-fallback-parse_printf_format-implementation.patch renamed from meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch +14 -11
@@ -1,7 +1,7 @@ -From 776913624aaf696a3b2920b8d7506b3aae042bf1 Mon Sep 17 00:00:00 2001 +From 4a4005583e2debe491850229aa5ae2a97770532d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Sat, 22 May 2021 20:26:24 +0200 -Subject: [PATCH] add fallback parse_printf_format implementation +Subject: [PATCH 05/27] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific]
@@ -22,22 +22,22 @@ Signed-off-by: Scott Murray <[email protected]> create mode 100644 src/basic/parse-printf-format.h diff --git a/meson.build b/meson.build -index 187e7b216d..c4694a9ddc 100644 +index 52723bef09..e20bf3af8a 100644 --- a/meson.build +++ b/meson.build -@@ -727,6 +727,7 @@ endif - foreach header : ['crypt.h', +@@ -753,6 +753,7 @@ foreach header : ['crypt.h', 'linux/memfd.h', + 'linux/time_types.h', 'linux/vm_sockets.h', + 'printf.h', 'sys/auxv.h', + 'sys/sdt.h', 'threads.h', - 'valgrind/memcheck.h', diff --git a/src/basic/meson.build b/src/basic/meson.build -index 111253e3a5..bdaa2fc5e4 100644 +index 9a214575a5..b49b6ade56 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build -@@ -183,6 +183,11 @@ endforeach +@@ -189,6 +189,11 @@ endforeach basic_sources += generated_gperf_headers
@@ -392,7 +392,7 @@ index 0000000000..47be7522d7 + +#endif /* HAVE_PRINTF_H */ diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h -index 4e93ac90c9..f9deb6f662 100644 +index 0a2239d022..43a765dacd 100644 --- a/src/basic/stdio-util.h +++ b/src/basic/stdio-util.h @@ -1,12 +1,12 @@
@@ -408,9 +408,9 @@ index 4e93ac90c9..f9deb6f662 100644 +#include "parse-printf-format.h" _printf_(3, 4) - static inline char *snprintf_ok(char *buf, size_t len, const char *format, ...) { + static inline char* snprintf_ok(char *buf, size_t len, const char *format, ...) { diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c -index be23b2fe75..69a2eb6404 100644 +index 7d02b57d7b..75e8e08add 100644 --- a/src/libsystemd/sd-journal/journal-send.c +++ b/src/libsystemd/sd-journal/journal-send.c @@ -2,7 +2,6 @@
@@ -429,3 +429,6 @@ index be23b2fe75..69a2eb6404 100644 #define SNDBUF_SIZE (8*1024*1024) +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch renamed from meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +13 -9
@@ -1,7 +1,8 @@ -From 2903e42c7cd727a2374d21b78950308de792ebe8 Mon Sep 17 00:00:00 2001 +From ed836c3478e1193e99e37d50db96d124796a3322 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined +Subject: [PATCH 06/27] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not + defined If the standard library doesn't provide brace expansion users just won't get it.
@@ -63,11 +64,11 @@ index 802ca8c655..23818a67c6 100644 return -ENOENT; if (k == GLOB_NOSPACE) diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c -index 9b3e73cce0..3790ba3be5 100644 +index 49d71f15c7..0a49ebcc17 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c @@ -34,6 +34,12 @@ TEST(glob_first) { - assert_se(first == NULL); + ASSERT_NULL(first); } +/* Don't fail if the standard library
@@ -114,7 +115,7 @@ index 9b3e73cce0..3790ba3be5 100644 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 6a1c7725a1..138b3ac561 100644 +index 807925f199..b4f86fc611 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -73,6 +73,12 @@
@@ -130,7 +131,7 @@ index 6a1c7725a1..138b3ac561 100644 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create * properly owned directories beneath /tmp, /var/tmp, /run, which are -@@ -2426,7 +2432,9 @@ finish: +@@ -2570,7 +2576,9 @@ finish: static int glob_item(Context *c, Item *i, action_t action) { _cleanup_globfree_ glob_t g = {
@@ -138,9 +139,9 @@ index 6a1c7725a1..138b3ac561 100644 .gl_opendir = (void *(*)(const char *)) opendir_nomod, +#endif }; - int r = 0, k; + int r; -@@ -2453,7 +2461,9 @@ static int glob_item_recursively( +@@ -2598,7 +2606,9 @@ static int glob_item_recursively( fdaction_t action) { _cleanup_globfree_ glob_t g = {
@@ -148,5 +149,8 @@ index 6a1c7725a1..138b3ac561 100644 .gl_opendir = (void *(*)(const char *)) opendir_nomod, +#endif }; - int r = 0, k; + int r; +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0007-add-missing-FTW_-macros-for-musl.patch renamed from meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch +6 -3
@@ -1,7 +1,7 @@ -From dcd9639657e4122b7665b01a067219f990ee3ace Mon Sep 17 00:00:00 2001 +From 8320725f1a9088623da8753c7077473b98a63107 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH] add missing FTW_ macros for musl +Subject: [PATCH 07/27] add missing FTW_ macros for musl This is to avoid build failures like below for musl.
@@ -16,7 +16,7 @@ Signed-off-by: Chen Qi <[email protected]> 2 files changed, 5 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index 6c0456349d..73a5b90e3c 100644 +index fc33b76ec1..34a36d83f0 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -14,3 +14,7 @@
@@ -39,3 +39,6 @@ index 8684d064ec..70fc2b5376 100644 static char **list_nftw = NULL; +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0008-Use-uintmax_t-for-handling-rlim_t.patch renamed from meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch +13 -10
@@ -1,7 +1,7 @@ -From c58933386caa8e45b5e814ec4ff210b18ab401da Mon Sep 17 00:00:00 2001 +From 41abe1a4136babfe5df63e9561dcf29d3c8fe6e9 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:12:41 +0800 -Subject: [PATCH] Use uintmax_t for handling rlim_t +Subject: [PATCH 08/27] Use uintmax_t for handling rlim_t PRIu{32,64} is not right format to represent rlim_t type therefore use %ju and typecast the rlim_t variables to
@@ -27,10 +27,10 @@ Signed-off-by: Chen Qi <[email protected]> 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/basic/format-util.h b/src/basic/format-util.h -index 8719df3e29..9becc96066 100644 +index ba7cff6a8b..2736abb07b 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h -@@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); +@@ -42,13 +42,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); # error Unknown timex member size #endif
@@ -46,10 +46,10 @@ index 8719df3e29..9becc96066 100644 #if SIZEOF_DEV_T == 8 # define DEV_FMT "%" PRIu64 diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c -index c1f0b2b974..61c5412582 100644 +index a9f7b87f28..059c67731d 100644 --- a/src/basic/rlimit-util.c +++ b/src/basic/rlimit-util.c -@@ -44,7 +44,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) { +@@ -47,7 +47,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) { fixed.rlim_max == highest.rlim_max) return 0;
@@ -58,7 +58,7 @@ index c1f0b2b974..61c5412582 100644 return RET_NERRNO(setrlimit(resource, &fixed)); } -@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { +@@ -310,13 +310,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) r = free_and_strdup(&s, "infinity"); else if (rl->rlim_cur >= RLIM_INFINITY)
@@ -76,7 +76,7 @@ index c1f0b2b974..61c5412582 100644 if (r < 0) return -ENOMEM; -@@ -422,7 +422,7 @@ int rlimit_nofile_safe(void) { +@@ -425,7 +425,7 @@ int rlimit_nofile_safe(void) { rl.rlim_max = MIN(rl.rlim_max, (rlim_t) read_nr_open()); rl.rlim_cur = MIN((rlim_t) FD_SETSIZE, rl.rlim_max); if (setrlimit(RLIMIT_NOFILE, &rl) < 0)
@@ -86,10 +86,10 @@ index c1f0b2b974..61c5412582 100644 return 1; } diff --git a/src/core/execute.c b/src/core/execute.c -index 531bec4c92..602a95f674 100644 +index 513e95e09d..0e269617f8 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -1041,9 +1041,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -1067,9 +1067,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { for (unsigned i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n",
@@ -101,3 +101,6 @@ index 531bec4c92..602a95f674 100644 } if (c->ioprio_set) { +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch renamed from meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +6 -3
@@ -1,7 +1,7 @@ -From 5bf8235bc5c802908aa5d95740350927d87e953a Mon Sep 17 00:00:00 2001 +From 8af5d1e3c0dc7e71f7a4aee0f539a5d772d47354 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <[email protected]> Date: Tue, 10 Oct 2017 14:33:30 -0700 -Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() +Subject: [PATCH 09/27] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to do and it's not portable (not supported by musl). See:
@@ -31,7 +31,7 @@ Signed-off-by: Andre McCurdy <[email protected]> 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h -index 6a1e2e76d1..c3f7235e09 100644 +index 3e2db95304..d5747416b0 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -49,8 +49,27 @@ int futimens_opath(int fd, const struct timespec ts[2]);
@@ -94,3 +94,6 @@ index a4e2dae245..67aa8ea1f2 100644 continue; } +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch renamed from meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch +7 -3
@@ -1,7 +1,8 @@ -From d98f6bd4d8acdc4c1a5bff4c699f5004a6ebccce Mon Sep 17 00:00:00 2001 +From ea8e85d92f67a7af8577a4ce7c67c7aaee65d10c Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sun, 27 May 2018 08:36:44 -0700 -Subject: [PATCH] Define glibc compatible basename() for non-glibc systems +Subject: [PATCH 10/27] Define glibc compatible basename() for non-glibc + systems Fixes builds with musl, even though systemd is adamant about using non-posix basename implementation, we have a way out
@@ -14,7 +15,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 4 insertions(+) diff --git a/src/basic/string-util.h b/src/basic/string-util.h -index b6d8be3083..0a29036c4c 100644 +index ff5efbcf55..d1a6bb0e76 100644 --- a/src/basic/string-util.h +++ b/src/basic/string-util.h @@ -26,6 +26,10 @@
@@ -28,3 +29,6 @@ index b6d8be3083..0a29036c4c 100644 static inline char* strstr_ptr(const char *haystack, const char *needle) { if (!haystack || !needle) return NULL; +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch renamed from meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +7 -4
@@ -1,7 +1,7 @@ -From f3943f58f3c8a9d20dcada56eb5ca5f673a49b3d Mon Sep 17 00:00:00 2001 +From 7c8634c441401b034cd4bcf4b916a7042076fca8 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Wed, 4 Jul 2018 15:00:44 +0800 -Subject: [PATCH] Do not disable buffering when writing to oom_score_adj +Subject: [PATCH 11/27] Do not disable buffering when writing to oom_score_adj On musl, disabling buffering when writing to oom_score_adj will cause the following error.
@@ -24,10 +24,10 @@ Signed-off-by: Scott Murray <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 4492e7ded2..b61a2aba74 100644 +index c9d968dee0..7d6d3ce7db 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -1716,7 +1716,7 @@ int set_oom_score_adjust(int value) { +@@ -1816,7 +1816,7 @@ int set_oom_score_adjust(int value) { xsprintf(t, "%i", value); return write_string_file("/proc/self/oom_score_adj", t,
@@ -36,3 +36,6 @@ index 4492e7ded2..b61a2aba74 100644 } int get_oom_score_adjust(int *ret) { +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch renamed from meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +6 -3
@@ -1,7 +1,7 @@ -From 5305c5f18236a9d7f2e633ea6ad317e09e8f29d5 Mon Sep 17 00:00:00 2001 +From 4a2df0bba1741914617ca1271e2bc68a5d9e5dac Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi +Subject: [PATCH 12/27] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different.
@@ -55,7 +55,7 @@ index f415797700..a5c6e9a3bd 100644 static bool map_ok(const sd_bus_error_map *map) { diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c -index 69a2eb6404..1561859650 100644 +index 75e8e08add..41e5c7c2b8 100644 --- a/src/libsystemd/sd-journal/journal-send.c +++ b/src/libsystemd/sd-journal/journal-send.c @@ -361,7 +361,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove
@@ -71,3 +71,6 @@ index 69a2eb6404..1561859650 100644 if (errno == 0) { char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0013-avoid-redefinition-of-prctl_mm_map-structure.patch renamed from meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch +8 -5
@@ -1,7 +1,7 @@ -From c866c8652f06af4cd0b9bd7eedc606449f432b95 Mon Sep 17 00:00:00 2001 +From 846b8f16cf07d9187261e06701a75eb208caa707 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH] avoid redefinition of prctl_mm_map structure +Subject: [PATCH 13/27] avoid redefinition of prctl_mm_map structure Fix the following compile failure: error: redefinition of 'struct prctl_mm_map'
@@ -14,7 +14,7 @@ Signed-off-by: Chen Qi <[email protected]> 1 file changed, 2 insertions(+) diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h -index 7d9e395c92..88c2d7dfac 100644 +index 2c9f9f6c50..65a984b564 100644 --- a/src/basic/missing_prctl.h +++ b/src/basic/missing_prctl.h @@ -1,7 +1,9 @@
@@ -25,5 +25,8 @@ index 7d9e395c92..88c2d7dfac 100644 #include <linux/prctl.h> +#endif - /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ - #ifndef PR_CAP_AMBIENT + #include "macro.h" + +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0014-do-not-disable-buffer-in-writing-files.patch renamed from meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch +82 -69
358 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0015-Handle-__cpu_mask-usage.patch renamed from meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch +6 -3
@@ -1,7 +1,7 @@ -From f6b69f28657c09b1181552d85e52ced0e01182e3 Mon Sep 17 00:00:00 2001 +From c1cbec8571855b8480d56dcad2ab81aea0782bd4 Mon Sep 17 00:00:00 2001 From: Scott Murray <[email protected]> Date: Fri, 13 Sep 2019 19:26:27 -0400 -Subject: [PATCH] Handle __cpu_mask usage +Subject: [PATCH 15/27] Handle __cpu_mask usage Fixes errors:
@@ -24,7 +24,7 @@ Signed-off-by: Scott Murray <[email protected]> 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h -index 3c63a58826..4c2d4347fc 100644 +index 618fe1b0a3..46c92077b0 100644 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.h @@ -6,6 +6,8 @@
@@ -55,3 +55,6 @@ index ea0c58770e..b65c0bd370 100644 /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0016-Handle-missing-gshadow.patch renamed from meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch +26 -24
131 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch renamed from meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch +5 -2
@@ -1,7 +1,7 @@ -From 863dd6f502d53a4a2644e031eee2e8dfa3fd05aa Mon Sep 17 00:00:00 2001 +From 45bb63a1727097683acad23f270968026671ec6a Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 12 Apr 2021 23:44:53 -0700 -Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl +Subject: [PATCH 17/27] missing_syscall.h: Define MIPS ABI defines for musl musl does not define _MIPS_SIM_ABI32, _MIPS_SIM_NABI32, _MIPS_SIM_ABI64 unlike glibc where these are provided by libc headers, therefore define
@@ -44,3 +44,6 @@ index 67aa8ea1f2..8d9824495e 100644 typedef struct BaseFilesystem { const char *dir; /* directory or symlink to create */ +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0018-pass-correct-parameters-to-getdents64.patch renamed from meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch +7 -4
@@ -1,7 +1,7 @@ -From 01de9e5a6e4ad2f361d3eb4d9839c7afd91cc677 Mon Sep 17 00:00:00 2001 +From 78a59a540d425e677d5652d9b72d7b175e36f4dd Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 21 Jan 2022 15:15:11 -0800 -Subject: [PATCH] pass correct parameters to getdents64 +Subject: [PATCH 18/27] pass correct parameters to getdents64 Fixes ../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types]
@@ -20,10 +20,10 @@ Signed-off-by: Jiaqing Zhao <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c -index 5e98b7a5d8..aef065047b 100644 +index 776733148b..d37419658c 100644 --- a/src/basic/recurse-dir.c +++ b/src/basic/recurse-dir.c -@@ -55,7 +55,7 @@ int readdir_all(int dir_fd, +@@ -56,7 +56,7 @@ int readdir_all(int dir_fd, bs = MIN(MALLOC_SIZEOF_SAFE(de) - offsetof(DirectoryEntries, buffer), (size_t) SSIZE_MAX); assert(bs > de->buffer_size);
@@ -32,3 +32,6 @@ index 5e98b7a5d8..aef065047b 100644 if (n < 0) return -errno; if (n == 0) +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0019-Adjust-for-musl-headers.patch renamed from meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch +61 -104
385 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch renamed from meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch +8 -5
@@ -1,8 +1,8 @@ -From 20dfb0b5e7113c2e7f82c01488b419dffe8714ab Mon Sep 17 00:00:00 2001 +From e01f0c444423eb65d176713735ff8cefb3068f3d Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 8 Nov 2022 13:31:34 -0800 -Subject: [PATCH] test-bus-error: strerror() is assumed to be GNU specific - version mark it so +Subject: [PATCH 20/27] test-bus-error: strerror() is assumed to be GNU + specific version mark it so Upstream-Status: Inappropriate [Upstream systemd only supports glibc]
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c -index a55f3f9856..4123bf3da0 100644 +index 91045c06c2..a06b9bac0c 100644 --- a/src/libsystemd/sd-bus/test-bus-error.c +++ b/src/libsystemd/sd-bus/test-bus-error.c @@ -99,7 +99,9 @@ TEST(error) {
@@ -27,7 +27,7 @@ index a55f3f9856..4123bf3da0 100644 assert_se(sd_bus_error_get_errno(&error) == EBUSY); assert_se(sd_bus_error_is_set(&error)); diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c -index 376d532281..967cfd4d67 100644 +index ab463bd1b3..e2ebcaaf33 100644 --- a/src/test/test-errno-util.c +++ b/src/test/test-errno-util.c @@ -4,7 +4,7 @@
@@ -47,3 +47,6 @@ index 376d532281..967cfd4d67 100644 TEST(PROTECT_ERRNO) { errno = 12; +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0021-errno-util-Make-STRERROR-portable-for-musl.patch renamed from meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch +6 -3
@@ -1,7 +1,7 @@ -From 32371040c2aa649e23c3b0f2c5ee27995a16526a Mon Sep 17 00:00:00 2001 +From d2f632dd6a8cca0fbdd6568ce84004335c004f58 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 23 Jan 2023 23:39:46 -0800 -Subject: [PATCH] errno-util: Make STRERROR portable for musl +Subject: [PATCH 21/27] errno-util: Make STRERROR portable for musl Sadly, systemd has decided to use yet another GNU extention in a macro lets make this such that we can use XSI compliant strerror_r() for
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h -index 27804e6382..274c1c6ef1 100644 +index 48b76e4bf7..6e7653e2d9 100644 --- a/src/basic/errno-util.h +++ b/src/basic/errno-util.h @@ -15,8 +15,16 @@
@@ -37,3 +37,6 @@ index 27804e6382..274c1c6ef1 100644 /* A helper to print an error message or message for functions that return 0 on EOF. * Note that we can't use ({ … }) to define a temporary variable, so errnum is * evaluated twice. */ +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch renamed from meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch +8 -5
@@ -1,7 +1,7 @@ -From 751fb8c9a05115f5329cfa25e69afe7657124c20 Mon Sep 17 00:00:00 2001 +From 4a3ed5aaaf108d3a07f24997698906e801ba2412 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 2 Aug 2023 12:06:27 -0700 -Subject: [PATCH] sd-event: Make malloc_trim() conditional on glibc +Subject: [PATCH 22/27] sd-event: Make malloc_trim() conditional on glibc musl does not have this API
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c -index b6899df192..0c03287004 100644 +index a1305ef014..b8a73da2a3 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c -@@ -1874,7 +1874,7 @@ _public_ int sd_event_add_exit( +@@ -1877,7 +1877,7 @@ _public_ int sd_event_add_exit( } _public_ int sd_event_trim_memory(void) {
@@ -24,7 +24,7 @@ index b6899df192..0c03287004 100644 /* A default implementation of a memory pressure callback. Simply releases our own allocation caches * and glibc's. This is automatically used when people call sd_event_add_memory_pressure() with a -@@ -1888,7 +1888,9 @@ _public_ int sd_event_trim_memory(void) { +@@ -1891,7 +1891,9 @@ _public_ int sd_event_trim_memory(void) { usec_t before_timestamp = now(CLOCK_MONOTONIC); hashmap_trim_pools();
@@ -34,3 +34,6 @@ index b6899df192..0c03287004 100644 usec_t after_timestamp = now(CLOCK_MONOTONIC); if (r > 0) +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0023-shared-Do-not-use-malloc_info-on-musl.patch renamed from meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch +7 -4
@@ -1,7 +1,7 @@ -From 4fe2a8b1aab7297beac50f6ce46f3df4169de218 Mon Sep 17 00:00:00 2001 +From d3880d167d8dfafbb8ee62f7737a869f9525f303 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 2 Aug 2023 12:20:40 -0700 -Subject: [PATCH] shared: Do not use malloc_info on musl +Subject: [PATCH 23/27] shared: Do not use malloc_info on musl Upstream-Status: Inappropriate [musl-specific] Signed-off-by: Khem Raj <[email protected]>
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c -index 74f148c8b4..2d862a123d 100644 +index 30f9602b1e..5308f168db 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c -@@ -611,15 +611,16 @@ static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdat +@@ -755,15 +755,16 @@ static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdat _cleanup_close_ int fd = -EBADF; size_t dump_size; FILE *f;
@@ -52,3 +52,6 @@ index 8e70e365dd..9e782caec9 100644 (void) memstream_dump(LOG_INFO, &m); break; } +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0024-avoid-missing-LOCK_EX-declaration.patch renamed from meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch +20 -4
@@ -1,7 +1,7 @@ -From 97d3ed7834bd86615ba4acdbef984c677b7e7791 Mon Sep 17 00:00:00 2001 +From ca2a736627f8ee8dd9dbbf5b3149d4c8493833ff Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Tue, 2 Jan 2024 11:03:27 +0800 -Subject: [PATCH] avoid missing LOCK_EX declaration +Subject: [PATCH 24/27] avoid missing LOCK_EX declaration This only happens on MUSL. Include sys/file.h to avoid compilation error about missing LOCK_EX declaration.
@@ -10,12 +10,25 @@ Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <[email protected]> --- + src/basic/fd-util.h | 1 + src/core/exec-invoke.c | 1 + src/shared/dev-setup.h | 1 + - 2 files changed, 2 insertions(+) + 3 files changed, 3 insertions(+) +diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h +index af17481dd8..fa20bfa30f 100644 +--- a/src/basic/fd-util.h ++++ b/src/basic/fd-util.h +@@ -6,6 +6,7 @@ + #include <stdbool.h> + #include <stdio.h> + #include <sys/socket.h> ++#include <sys/file.h> + + #include "macro.h" + #include "missing_fcntl.h" diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c -index fe14ceeb31..521e7b87ff 100644 +index ee8db04e76..2aff654f0f 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -4,6 +4,7 @@
@@ -38,3 +51,6 @@ index 5339bc4e5e..0697495f23 100644 int lock_dev_console(void); +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch new file +27 -0
@@ -0,0 +1,27 @@ +From ecf124ab2e488a71741fe443ff4863f7ed172968 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Tue, 2 Jul 2024 22:18:47 -0700 +Subject: [PATCH 25/27] include signal.h to avoid the 'undeclared' error + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Chen Qi <[email protected]> +--- + src/basic/pidref.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/pidref.h b/src/basic/pidref.h +index 9920ebb9b3..2fdd4ff50f 100644 +--- a/src/basic/pidref.h ++++ b/src/basic/pidref.h +@@ -1,6 +1,7 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + #pragma once + ++#include <signal.h> + #include "macro.h" + + /* An embeddable structure carrying a reference to a process. Supposed to be used when tracking processes continuously. */ +-- +2.45.1 +
meta/recipes-core/systemd/systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch new file +48 -0
48 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch new file +76 -0
76 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 0e4379088b1cf607b605b785f6f23943ebeb6584 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Wed, 3 Jul 2024 07:18:42 -0700 +Subject: [PATCH 28/28] build-path.c: avoid boot time segfault for musl + +This function, at runtime, should return -ENOEXEC. For musl, it +somehow segfaults. I think it's related to getauxval, but it's +really does not matter, just return -ENOEXEC. + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Chen Qi <[email protected]> +--- + src/basic/build-path.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/build-path.c b/src/basic/build-path.c +index b5972658df..4ef551034e 100644 +--- a/src/basic/build-path.c ++++ b/src/basic/build-path.c +@@ -151,6 +151,7 @@ int get_build_exec_dir(char **ret) { + */ + + static int runpath_cached = -ERRNO_MAX-1; ++ return -ENOEXEC; + if (runpath_cached == -ERRNO_MAX-1) { + const char *runpath = NULL; + +-- +2.45.1 +
meta/recipes-core/systemd/systemd_256.bb renamed from meta/recipes-core/systemd/systemd_255.6.bb +32 -28
101 lines not on this page · raw message
Signature · 1 line
2.45.1
PATCH 2/4 systemd-boot: upgrade from 255.6 to 256
From: Chen Qi <[email protected]>
Patch 0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch is added to resolve build time error.
---
...ve_255.6.bb => systemd-boot-native_256.bb} | 0
...temd-boot_255.6.bb => systemd-boot_256.bb} | 2 ++
...on.build-ensure-VERSION_TAG-exists-i.patch | 32 +++++++++++++++++++
3 files changed, 34 insertions(+)
rename meta/recipes-core/systemd/{systemd-boot-native_255.6.bb => systemd-boot-native_256.bb} (100%)
rename meta/recipes-core/systemd/{systemd-boot_255.6.bb => systemd-boot_256.bb} (95%)
create mode 100644 meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patchmeta/recipes-core/systemd/systemd-boot-native_256.bb renamed from meta/recipes-core/systemd/systemd-boot-native_255.6.bb +0 -0
meta/recipes-core/systemd/systemd-boot_256.bb renamed from meta/recipes-core/systemd/systemd-boot_255.6.bb +2 -0
@@ -1,6 +1,8 @@ require systemd.inc FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" +SRC_URI += "file://0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch" + require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gperf-native python3-jinja2-native python3-pyelftools-native"
meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 9df06062cebd0390d33de9694e9cb1c9fa7b8697 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Wed, 3 Jul 2024 23:18:41 -0700 +Subject: [PATCH] src/boot/efi/meson.build: ensure VERSION_TAG exists in case + of cross build + +The GIT_VERSION is changed to use VERSION_TAG, but in case of cross build +for src/boot/efi, it's not set, causing build error because the compiler cannot +know it's a macro thus treating it as some variable and error out. + +Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/33612] + +Signed-off-by: Chen Qi <[email protected]> +--- + src/boot/efi/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build +index 7a60b0ec7e..99d108d6e8 100644 +--- a/src/boot/efi/meson.build ++++ b/src/boot/efi/meson.build +@@ -65,6 +65,7 @@ endforeach + + if meson.is_cross_build() and get_option('sbat-distro') == 'auto' + warning('Auto detection of SBAT information not supported when cross-building, disabling SBAT.') ++ efi_conf.set_quoted('VERSION_TAG', version_tag) + elif get_option('sbat-distro') != '' + efi_conf.set_quoted('SBAT_PROJECT', meson.project_name()) + efi_conf.set_quoted('PROJECT_VERSION', meson.project_version().split('~')[0]) +-- +2.45.1 +
Signature · 1 line
2.45.1
PATCH 3/4 util-linux/util-linux-libuuid: upgrade from 2.39.3 to 2.40.1
In reply to [email protected]From: Chen Qi <[email protected]>
License-Update:
===============
GPL-2.0 is changed to GPL-2.0-only in README.licensing.
The following two patches are removed as they've been there in new release:
0001-login-utils-include-libgen.h-for-basename-API.patch mit-license.patch
Other existing patches are refreshed to avoid patch-fuzz error.
A new PACKAGECONFIG, lastlog2, is added, which serves as a switch to build Y2038 safe lastlog pam module. This is a new functionality added in 2.40.
This 2.40.1 version has the problem of unnecessary remake, causing intermmittent errors at parallel make. The do_compile:prepend is a workaround for this. Upstream issue and PR are:
https://github.com/util-linux/util-linux/issues/3061
https://github.com/util-linux/util-linux/pull/3064
do_install is changed to do_install:append, the legacy codes are removed. They've been there since the born of oe-core. I tested with ccache, there's no error.
---
...2.39.3.bb => util-linux-libuuid_2.40.1.bb} | 0
meta/recipes-core/util-linux/util-linux.inc | 8 +--
...ls-include-libgen.h-for-basename-API.patch | 60 -------------------
.../util-linux/avoid_parallel_tests.patch | 5 +-
.../util-linux/configure-sbindir.patch | 7 +--
.../display_testname_for_subtest.patch | 7 +--
.../util-linux/util-linux/mit-license.patch | 45 --------------
.../util-linux/util-linux/ptest.patch | 11 ++--
...l-linux_2.39.3.bb => util-linux_2.40.1.bb} | 21 ++++---
9 files changed, 29 insertions(+), 135 deletions(-)
rename meta/recipes-core/util-linux/{util-linux-libuuid_2.39.3.bb => util-linux-libuuid_2.40.1.bb} (100%)
delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/mit-license.patch
rename meta/recipes-core/util-linux/{util-linux_2.39.3.bb => util-linux_2.40.1.bb} (95%)meta/recipes-core/util-linux/util-linux-libuuid_2.40.1.bb renamed from meta/recipes-core/util-linux/util-linux-libuuid_2.39.3.bb +0 -0
meta/recipes-core/util-linux/util-linux.inc +3 -5
@@ -6,7 +6,7 @@ disk partitioning, kernel message management, filesystem creation, and system lo SECTION = "base" -LICENSE = "GPL-1.0-or-later & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" +LICENSE = "GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" LICENSE:${PN}-fcntl-lock = "MIT" LICENSE:${PN}-fdisk = "GPL-1.0-or-later" LICENSE:${PN}-libblkid = "LGPL-2.1-or-later"
@@ -14,7 +14,7 @@ LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" LICENSE:${PN}-libmount = "LGPL-2.1-or-later" LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://README.licensing;md5=cc80239f106687ab39ef0271ff5cf4ba \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=ddd58b6c94da86ff4f03e91208eb9cfc \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \
@@ -30,7 +30,6 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=cc80239f106687ab39ef0271ff5cf4ba FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ - file://mit-license.patch \ file://configure-sbindir.patch \ file://runuser.pamd \ file://runuser-l.pamd \
@@ -38,8 +37,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://0001-login-utils-include-libgen.h-for-basename-API.patch \ file://fcntl-lock.c \ " -SRC_URI[sha256sum] = "7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f" +SRC_URI[sha256sum] = "59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f"
meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch deleted +0 -60
60 lines not on this page · raw message
meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch +2 -3
@@ -1,4 +1,4 @@ -From 0b05e4695a0616badef71dfa459a00ef6ff1b521 Mon Sep 17 00:00:00 2001 +From da58b4150f6932de36c962ea657713bcf4ea44be Mon Sep 17 00:00:00 2001 From: Tudor Florea <[email protected]> Date: Mon, 14 Jun 2021 14:00:31 +0200 Subject: [PATCH] util-linux: Add ptest
@@ -9,13 +9,12 @@ Revert run.sh script accordingly to serialize running tests Signed-off-by: Tudor Florea <[email protected]> Upstream-Status: Inappropriate - --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 890212f..870e817 100644 +index 651ef2b..2a8012e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4])
meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +3 -4
@@ -1,4 +1,4 @@ -From c79222a9a5e3425c55e150edc0b7ac59c573aa2f Mon Sep 17 00:00:00 2001 +From 0387d71516c978899cfd556ca512f530a212b4a9 Mon Sep 17 00:00:00 2001 From: Phil Blundell <[email protected]> Date: Mon, 24 Sep 2012 07:24:51 +0100 Subject: [PATCH] util-linux: Ensure that ${sbindir} is respected
@@ -9,16 +9,15 @@ fix the test, the [ ] syntax was getting eaten by autoconf Signed-off-by: Phil Blundell <[email protected]> Signed-off-by: Saul Wold <[email protected] Upstream-Status: Inappropriate [configuration] - --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 36c24b4..890212f 100644 +index 23594ff..651ef2b 100644 --- a/configure.ac +++ b/configure.ac -@@ -102,7 +102,10 @@ AC_SUBST([runstatedir]) +@@ -110,7 +110,10 @@ AC_SUBST([runstatedir]) usrbin_execdir='${exec_prefix}/bin' AC_SUBST([usrbin_execdir])
meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch +3 -4
@@ -1,20 +1,19 @@ -From fc5de1de898fd1a372a2fd2fa493dc57323a029d Mon Sep 17 00:00:00 2001 +From 45450d0339cd7ee27f53c0f2fac1cc74ed9bbfb8 Mon Sep 17 00:00:00 2001 From: Tudor Florea <[email protected]> Date: Thu, 3 Dec 2015 04:08:00 +0100 Subject: [PATCH] Display testname for subtest Signed-off-by: Tudor Florea <[email protected]> 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 5a562a3..098145e 100644 +index 5fe5ba0..a6c703e 100644 --- a/tests/functions.sh +++ b/tests/functions.sh -@@ -437,7 +437,7 @@ function ts_init_subtest { +@@ -450,7 +450,7 @@ function ts_init_subtest { if [ "$TS_PARSABLE" != "yes" ]; then [ $TS_NSUBTESTS -eq 1 ] && echo
meta/recipes-core/util-linux/util-linux/mit-license.patch deleted +0 -45
45 lines not on this page · raw message
meta/recipes-core/util-linux/util-linux/ptest.patch +5 -6
@@ -1,24 +1,23 @@ -From d0a69ce80c579cbb7627a2f20e8b92e006a8d8ad Mon Sep 17 00:00:00 2001 +From f9be73c3e2b0a4f0923950dcb058be85d3ee8ed7 Mon Sep 17 00:00:00 2001 From: Tudor Florea <[email protected]> Date: Thu, 3 Dec 2015 04:08:00 +0100 Subject: [PATCH] Define TESTS variable Signed-off-by: Tudor Florea <[email protected]> Upstream-Status: Pending - --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am -index effbb02..7d2bd1e 100644 +index 50ab8d0..7e2340d 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -57,6 +57,7 @@ systemdsystemunit_DATA = +@@ -64,6 +64,7 @@ tmpfiles_DATA = dist_bashcompletion_DATA = check_PROGRAMS = dist_check_SCRIPTS = +TESTS = $(check_PROGRAMS) - PATHFILES = - ADOCFILES_COMMON = + BUILT_SOURCES = +
meta/recipes-core/util-linux/util-linux_2.40.1.bb renamed from meta/recipes-core/util-linux/util-linux_2.39.3.bb +13 -8
@@ -90,7 +90,7 @@ EXTRA_OECONF:append = " --disable-hwclock-gplv3" # build host versions during development # PACKAGECONFIG ?= "pcre2" -PACKAGECONFIG:class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam', '', d)}" +PACKAGECONFIG:class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam lastlog2', '', d)}" # inherit manpages requires this to be present, however util-linux does not have # configuration options, and installs manpages always PACKAGECONFIG[manpages] = ""
@@ -106,6 +106,7 @@ PACKAGECONFIG[pcre2] = ",,libpcre2" PACKAGECONFIG[cryptsetup] = "--with-cryptsetup,--without-cryptsetup,cryptsetup" PACKAGECONFIG[chfn-chsh] = "--enable-chfn-chsh,--disable-chfn-chsh," PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" +PACKAGECONFIG[lastlog2] = "--enable-liblastlog2,--disable-liblastlog2,sqlite3" EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'"
@@ -117,6 +118,7 @@ FILES:${PN}-mount = "${sysconfdir}/default/mountall" FILES:${PN}-runuser = "${sysconfdir}/pam.d/runuser*" FILES:${PN}-su = "${sysconfdir}/pam.d/su-l" CONFFILES:${PN}-su = "${sysconfdir}/pam.d/su-l" +FILES:${PN}-lastlog2 += "${base_libdir}/security/pam_lastlog2.so" FILES:${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*"
@@ -147,18 +149,21 @@ SYSTEMD_AUTO_ENABLE:${PN}-uuidd = "disable" SYSTEMD_SERVICE:${PN}-fstrim = "fstrim.timer fstrim.service" SYSTEMD_AUTO_ENABLE:${PN}-fstrim = "disable" +do_compile:prepend () { + # this is a workaround for the unnecessary remake problem. Issue and PR are as below: + # https://github.com/util-linux/util-linux/issues/3061 + # https://github.com/util-linux/util-linux/pull/3064 + # When newly release tarball contains the above fix, the following workaround could be dropped. + [ -e ${S}/libsmartcols/src/filter-scanner.c ] && touch ${S}/libsmartcols/src/filter-scanner.c + [ -e ${S}/libsmartcols/src/filter-parser.c ] && touch ${S}/libsmartcols/src/filter-parser.c +} + do_compile:append () { cp ${UNPACKDIR}/fcntl-lock.c ${S}/fcntl-lock.c ${CC} ${CFLAGS} ${LDFLAGS} ${S}/fcntl-lock.c -o ${B}/fcntl-lock } -do_install () { - # with ccache the timestamps on compiled files may - # end up earlier than on their inputs, this allows - # for the resultant compilation in the install step. - oe_runmake 'CC=${CC}' 'LD=${LD}' \ - 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install - +do_install:append () { mkdir -p ${D}${base_bindir} sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
Signature · 1 line
2.45.1
Re: [OE-core][PATCH 3/4] util-linux/util-linux-libuuid: upgrade from 2.39.3 to 2.40.1
Quoted 24 lines · Chen Qi via lists.openembedded.org
From: Chen Qi <[email protected]>
License-Update:
===============
GPL-2.0 is changed to GPL-2.0-only in README.licensing.The following two patches are removed as they've been there in new release:
0001-login-utils-include-libgen.h-for-basename-API.patch mit-license.patch
Other existing patches are refreshed to avoid patch-fuzz error.
A new PACKAGECONFIG, lastlog2, is added, which serves as a switch to build Y2038
safe lastlog pam module. This is a new functionality added in 2.40.This 2.40.1 version has the problem of unnecessary remake, causing intermmittent errors at parallel make. The do_compile:prepend is a workaround for this. Upstream issue and PR are:
https://github.com/util-linux/util-linux/issues/3061
https://github.com/util-linux/util-linux/pull/3064
Quoted 6 lines
do_installis changed to do_install:append, the legacy codes are removed. They've been there since the born of oe-core. I tested with ccache, there's no error.Signed-off-by Chen Qi <[email protected]>
I think these warnings in musl builds may be related to this:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/9230/steps/11/logs/warnings
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/9241
As well as this ptest regressions:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6786
(arm ptest is still building at present:
https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/6608)
Cheers,
Richard
Re: [OE-core][PATCH 3/4] util-linux/util-linux-libuuid: upgrade from 2.39.3 to 2.40.1
Quoted 30 lines · Richard Purdie
Quoted 28 lines · Chen Qi via lists.openembedded.org
From: Chen Qi <[email protected]>
License-Update:
===============
GPL-2.0 is changed to GPL-2.0-only in README.licensing.The following two patches are removed as they've been there in new release:
0001-login-utils-include-libgen.h-for-basename-API.patch mit-license.patch
Other existing patches are refreshed to avoid patch-fuzz error.
A new PACKAGECONFIG, lastlog2, is added, which serves as a switch to build Y2038
safe lastlog pam module. This is a new functionality added in 2.40.This 2.40.1 version has the problem of unnecessary remake, causing intermmittent errors at parallel make. The do_compile:prepend is a workaround for this. Upstream issue and PR are:
https://github.com/util-linux/util-linux/issues/3061
https://github.com/util-linux/util-linux/pull/3064
do_installis changed to do_install:append, the legacy codes are removed. They've been there since the born of oe-core. I tested with ccache, there's no error.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Chen Qi <[email protected]>I think these warnings in musl builds may be related to this:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/9230/steps/11/logs/warnings
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/9241
I've reproduced the above issue. I'm looking into it now.
Quoted 7 lines
As well as this ptest regressions:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6786
(arm ptest is still building at present:
https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/6608)
I'll look into the ptest failure ASAP.
Regards,
Qi
Quoted 5 lines
Cheers,
Richard
PATCH 4/4 pciutils: remove textrel INSANE_SKIP
In reply to [email protected]From: Chen Qi <[email protected]>
The current pciutils does not have this textrel problem any more.
--- meta/recipes-bsp/pciutils/pciutils_3.13.0.bb | 2 -- 1 file changed, 2 deletions(-)
meta/recipes-bsp/pciutils/pciutils_3.13.0.bb +0 -2
@@ -47,8 +47,6 @@ DESCRIPTION:${PN}-ids = "Package providing the PCI device ID database for pciuti RDEPENDS:${PN} += "${PN}-ids" FILES:libpci = "${libdir}/libpci.so.*" -# The versioned symbols in libpci appear to be causing relocations -INSANE_SKIP:libpci += "textrel" ALTERNATIVE:${PN} = "lspci" ALTERNATIVE_PRIORITY = "100"
Signature · 1 line
2.45.1
Quoted 19 lines · Chen Qi via lists.openembedded.org
From: Chen Qi <[email protected]>
The 'cgroupv2' PACKAGECONFIG is dropped as systemd now only supports cgroupv2.
mime is now inherited because
${datadir}/mime/packages/io.systemd.xmlis a mime type file.For musl specific patches, most are refreshed. One old patch is dropped, and three new ones are added.
Newly added:
build-path.c: avoid boot time segfault for musl
adjust header inclusion order to avoid redeclaration
undef stdin for references using stdin as a struct member includesignal.hto avoid the 'undeclared' error
Dropped:
src/basic/missing.h: check for missing strndupa
(drop reason: systemd does not use strndupa any more)
Quoted 1 line
Signed-off-by Chen Qi <[email protected]>
This is causing parselog failures in testing:
https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/6293/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/107/builds/6345
https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/8042
Cheers,
Richard