Fix musl patches for 254.4
cover Fix musl patches for 254.4
Drop the backports
Fix patch-fuzz
Khem Raj (2):
systemd: Drop two upstreamed musl patches
systemd: Refresh patches to avoid patch-fuzz
...14-Use-uintmax_t-for-handling-rlim_t.patch | 23 ++--- ...-not-disable-buffer-in-writing-files.patch | 89 +++++------------ .../0022-Handle-__cpu_mask-usage.patch | 9 +- .../0025-include-sys-file.h-for-LOCK_EX.patch | 29 ------ ...-Include-sys-timex.h-for-struct-time.patch | 28 ------ ...clude-missing-sys-file.h-for-LOCK_EX.patch | 98 ------------------- meta/recipes-core/systemd/systemd_254.4.bb | 3 - 7 files changed, 31 insertions(+), 248 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0025-include-sys-file.h-for-LOCK_EX.patch delete mode 100644 meta/recipes-core/systemd/systemd/0026-test-test-sizeof-Include-sys-timex.h-for-struct-time.patch delete mode 100644 meta/recipes-core/systemd/systemd/0027-include-missing-sys-file.h-for-LOCK_EX.patch
Signature · 1 line
2.42.0
PATCH 1/2 systemd: Drop two upstreamed musl patches
Signed-off-by Khem Raj <[email protected]>
--- .../0025-include-sys-file.h-for-LOCK_EX.patch | 29 ------ ...-Include-sys-timex.h-for-struct-time.patch | 28 ------ ...clude-missing-sys-file.h-for-LOCK_EX.patch | 98 ------------------- meta/recipes-core/systemd/systemd_254.4.bb | 3 - 4 files changed, 158 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0025-include-sys-file.h-for-LOCK_EX.patch delete mode 100644 meta/recipes-core/systemd/systemd/0026-test-test-sizeof-Include-sys-timex.h-for-struct-time.patch delete mode 100644 meta/recipes-core/systemd/systemd/0027-include-missing-sys-file.h-for-LOCK_EX.patch
meta/recipes-core/systemd/systemd/0025-include-sys-file.h-for-LOCK_EX.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 2 Aug 2023 10:33:48 -0700 -Subject: [PATCH] include sys/file.h for LOCK_EX - -Fixes -| ../git/src/basic/user-util.c:708:30: error: use of undeclared identifier 'LOCK_EX'; did you mean 'LOCK_BSD'? -| 708 | r = unposix_lock(fd, LOCK_EX); -| | ^~~~~~~ -| | LOCK_BSD - -Upstream-Status: Backport [https://github.com/systemd/systemd/pull/28647] -Signed-off-by: Khem Raj <[email protected]> ---- - src/basic/user-util.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/basic/user-util.c b/src/basic/user-util.c -index fe61a09005..5c39847733 100644 ---- a/src/basic/user-util.c -+++ b/src/basic/user-util.c -@@ -6,6 +6,7 @@ - #include <stdint.h> - #include <stdio.h> - #include <stdlib.h> -+#include <sys/file.h> - #include <sys/stat.h> - #include <unistd.h> - #include <utmp.h>
meta/recipes-core/systemd/systemd/0026-test-test-sizeof-Include-sys-timex.h-for-struct-time.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 2 Aug 2023 12:14:56 -0700 -Subject: [PATCH] test/test-sizeof: Include sys/timex.h for struct timex - -Fixes - -../git/src/test/test-sizeof.c:64:41: error: incomplete definition of type 'struct timex' - 64 | check(typeof(((struct timex *)0)->freq), SIZEOF_TIMEX_MEMBER); - | ~~~~~~~~~~~~~~~~~~~^ - -Upstream-Status: Backport [https://github.com/systemd/systemd/pull/28651] ---- - src/test/test-sizeof.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index 9d969cf8f1..b65c0bd370 100644 ---- a/src/test/test-sizeof.c -+++ b/src/test/test-sizeof.c -@@ -4,6 +4,7 @@ - #include <string.h> - #include <sys/resource.h> - #include <sys/socket.h> -+#include <sys/timex.h> - #include <sys/types.h> - - #define __STDC_WANT_IEC_60559_TYPES_EXT__
meta/recipes-core/systemd/systemd/0027-include-missing-sys-file.h-for-LOCK_EX.patch deleted +0 -98
98 lines not on this page · raw message
meta/recipes-core/systemd/systemd_254.4.bb +0 -3
@@ -54,9 +54,6 @@ SRC_URI_MUSL = "\ file://0001-Adjust-for-musl-headers.patch \ file://0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \ file://0003-errno-util-Make-STRERROR-portable-for-musl.patch \ - file://0025-include-sys-file.h-for-LOCK_EX.patch \ - file://0026-test-test-sizeof-Include-sys-timex.h-for-struct-time.patch \ - file://0027-include-missing-sys-file.h-for-LOCK_EX.patch \ file://0028-sd-event-Make-malloc_trim-conditional-on-glibc.patch \ file://0029-shared-Do-not-use-malloc_info-on-musl.patch \ "
Signature · 1 line
2.42.0
PATCH 2/2 systemd: Refresh patches to avoid patch-fuzz
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- ...14-Use-uintmax_t-for-handling-rlim_t.patch | 23 ++--- ...-not-disable-buffer-in-writing-files.patch | 89 +++++-------------- .../0022-Handle-__cpu_mask-usage.patch | 9 +- 3 files changed, 31 insertions(+), 90 deletions(-)
meta/recipes-core/systemd/systemd/0014-Use-uintmax_t-for-handling-rlim_t.patch +7 -16
@@ -26,11 +26,9 @@ Signed-off-by: Chen Qi <[email protected]> src/core/execute.c | 4 ++-- 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 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h -@@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); +@@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32 # error Unknown timex member size #endif
@@ -45,11 +43,9 @@ 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 33dfde9d6c..e018fd81fd 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) { +@@ -44,7 +44,7 @@ int setrlimit_closest(int resource, cons fixed.rlim_max == highest.rlim_max) return 0;
@@ -58,7 +54,7 @@ index 33dfde9d6c..e018fd81fd 100644 return RET_NERRNO(setrlimit(resource, &fixed)); } -@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { +@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *r 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,20 +72,18 @@ index 33dfde9d6c..e018fd81fd 100644 if (r < 0) return -ENOMEM; -@@ -403,7 +403,7 @@ int rlimit_nofile_safe(void) { - - rl.rlim_cur = FD_SETSIZE; +@@ -407,7 +407,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) - return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", rl.rlim_cur); + return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", (uintmax_t)rl.rlim_cur); return 1; } -diff --git a/src/core/execute.c b/src/core/execute.c -index 8ef76de9ab..ea1c203e43 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -6667,9 +6667,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -6707,9 +6707,9 @@ void exec_context_dump(const ExecContext for (unsigned i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n",
@@ -101,6 +95,3 @@ index 8ef76de9ab..ea1c203e43 100644 } if (c->ioprio_set) { --- -2.39.2 -
meta/recipes-core/systemd/systemd/0021-do-not-disable-buffer-in-writing-files.patch +23 -66
290 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0022-Handle-__cpu_mask-usage.patch +1 -8
@@ -23,8 +23,6 @@ Signed-off-by: Scott Murray <[email protected]> src/test/test-sizeof.c | 2 +- 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 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.h @@ -6,6 +6,8 @@
@@ -36,8 +34,6 @@ index 3c63a58826..4c2d4347fc 100644 /* This wraps the libc interface with a variable to keep the allocated size. */ typedef struct CPUSet { cpu_set_t *set; -diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index 6cf92bffde..937d26ca55 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,6 +1,5 @@
@@ -47,7 +43,7 @@ index 6cf92bffde..937d26ca55 100644 #include <stdio.h> #include <string.h> #include <sys/resource.h> -@@ -11,6 +10,7 @@ +@@ -12,6 +11,7 @@ #include <float.h> #include "time-util.h"
@@ -55,6 +51,3 @@ index 6cf92bffde..937d26ca55 100644 /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ --- -2.39.2 -
Signature · 1 line
2.42.0