systemd: stable update 255.4 -> 255.13
PATCH v2 1/1 systemd: stable update 255.4 -> 255.13
From: Randy MacLeod <[email protected]>
Full change log:
https://github.com/systemd/systemd-stable/compare/v255.4...v255.13
Refreshed most of the musl patches using devtool to eliminate patch fuzz.
Signed-off-by Randy MacLeod <[email protected]>
---
...255.4.bb => systemd-boot-native_255.13.bb} | 0
...d-boot_255.4.bb => systemd-boot_255.13.bb} | 0
meta/recipes-core/systemd/systemd.inc | 2 +-
...1-missing_type.h-add-comparison_fn_t.patch | 7 +-
...k-parse_printf_format-implementation.patch | 13 ++--
...tall-dependency-links-at-install-tim.patch | 9 +--
...missing.h-check-for-missing-strndupa.patch | 65 +++++++++----------
...OB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch | 14 ++--
...005-add-missing-FTW_-macros-for-musl.patch | 7 +-
...06-Use-uintmax_t-for-handling-rlim_t.patch | 11 ++--
...T_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 17 ++---
...patible-basename-for-non-glibc-syste.patch | 8 +--
...implment-systemd-sysv-install-for-OE.patch | 5 +-
...uffering-when-writing-to-oom_score_a.patch | 9 +--
...compliant-strerror_r-from-GNU-specif.patch | 13 ++--
...definition-of-prctl_mm_map-structure.patch | 7 +-
...-not-disable-buffer-in-writing-files.patch | 59 ++++++++---------
.../0013-Handle-__cpu_mask-usage.patch | 7 +-
.../systemd/0014-Handle-missing-gshadow.patch | 9 +--
...l.h-Define-MIPS-ABI-defines-for-musl.patch | 13 ++--
...ass-correct-parameters-to-getdents64.patch | 7 +-
.../0017-Adjust-for-musl-headers.patch | 17 ++---
...trerror-is-assumed-to-be-GNU-specifi.patch | 9 +--
...util-Make-STRERROR-portable-for-musl.patch | 7 +-
...ake-malloc_trim-conditional-on-glibc.patch | 9 +--
...hared-Do-not-use-malloc_info-on-musl.patch | 7 +-
...22-avoid-missing-LOCK_EX-declaration.patch | 11 ++--
.../{systemd_255.4.bb => systemd_255.13.bb} | 0
28 files changed, 134 insertions(+), 208 deletions(-)
rename meta/recipes-core/systemd/{systemd-boot-native_255.4.bb => systemd-boot-native_255.13.bb} (100%)
rename meta/recipes-core/systemd/{systemd-boot_255.4.bb => systemd-boot_255.13.bb} (100%)
rename meta/recipes-core/systemd/{systemd_255.4.bb => systemd_255.13.bb} (100%)meta/recipes-core/systemd/systemd-boot-native_255.13.bb renamed from meta/recipes-core/systemd/systemd-boot-native_255.4.bb +0 -0
meta/recipes-core/systemd/systemd-boot_255.13.bb renamed from meta/recipes-core/systemd/systemd-boot_255.4.bb +0 -0
meta/recipes-core/systemd/systemd.inc +1 -1
@@ -15,7 +15,7 @@ LICENSE:libsystemd = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "387a14a7b67b8b76adaed4175e14bb7e39b2f738" +SRCREV = "565916c245b53b49f5917f5326d21246f46ae3db" SRCBRANCH = "v255-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}"
meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch +2 -5
@@ -1,7 +1,7 @@ -From 01195eb9f7d59139fb45df506ac6b3968c14a57f Mon Sep 17 00:00:00 2001 +From af2784935b483bd0eb5705ef7072a5cea6fe9eef Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH 01/22] missing_type.h: add comparison_fn_t +Subject: [PATCH] missing_type.h: add comparison_fn_t Make it work with musl where comparison_fn_t and is not provided.
@@ -56,6 +56,3 @@ index ae91534198..7f67eea38b 100644 const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", --- -2.34.1 -
meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch +5 -8
@@ -1,7 +1,7 @@ -From 872b72739e62123867ce6c4f82aa37de24cc3f75 Mon Sep 17 00:00:00 2001 +From b9b4f9bbca46832ea152979d8c9459f29c2e83fa Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Sat, 22 May 2021 20:26:24 +0200 -Subject: [PATCH 02/22] add fallback parse_printf_format implementation +Subject: [PATCH] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific]
@@ -22,10 +22,10 @@ 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 7419e2b0b0..01fd3ffc19 100644 +index 2418d6e8f7..b544a69aaa 100644 --- a/meson.build +++ b/meson.build -@@ -725,6 +725,7 @@ endif +@@ -731,6 +731,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h',
@@ -34,7 +34,7 @@ index 7419e2b0b0..01fd3ffc19 100644 'threads.h', 'valgrind/memcheck.h', diff --git a/src/basic/meson.build b/src/basic/meson.build -index d7450d8b44..c3e3daf4bd 100644 +index 111253e3a5..bdaa2fc5e4 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -183,6 +183,11 @@ endforeach
@@ -429,6 +429,3 @@ index be23b2fe75..69a2eb6404 100644 #define SNDBUF_SIZE (8*1024*1024) --- -2.34.1 -
meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch +3 -6
@@ -1,8 +1,8 @@ -From 29a58009a172e369ad7166e16dab2f4945c6b0d2 Mon Sep 17 00:00:00 2001 +From 178b7b4adefdf1d80fa3a5eb54a49ef0fc12369f Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Thu, 21 Feb 2019 16:23:24 +0800 -Subject: [PATCH 1/2] binfmt: Don't install dependency links at install time - for the binfmt services +Subject: [PATCH] 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.
@@ -74,6 +74,3 @@ index 6861c76674..531e9fbd90 100644 + +[Install] +WantedBy=sysinit.target --- -2.34.1 -
meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch +31 -34
235 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +5 -9
@@ -1,8 +1,7 @@ -From 5325ab5813617f35f03806ec420829dde7104387 Mon Sep 17 00:00:00 2001 +From a15045a60893f29ce9720e62cafbc0b87908ad49 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH 04/22] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not - defined +Subject: [PATCH] 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.
@@ -115,7 +114,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 230ec09b97..2cc5f391d7 100644 +index f4c8ebc27f..e07ad66c65 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -73,6 +73,12 @@
@@ -131,7 +130,7 @@ index 230ec09b97..2cc5f391d7 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 -@@ -2434,7 +2440,9 @@ finish: +@@ -2426,7 +2432,9 @@ finish: static int glob_item(Context *c, Item *i, action_t action) { _cleanup_globfree_ glob_t g = {
@@ -141,7 +140,7 @@ index 230ec09b97..2cc5f391d7 100644 }; int r = 0, k; -@@ -2461,7 +2469,9 @@ static int glob_item_recursively( +@@ -2453,7 +2461,9 @@ static int glob_item_recursively( fdaction_t action) { _cleanup_globfree_ glob_t g = {
@@ -151,6 +150,3 @@ index 230ec09b97..2cc5f391d7 100644 }; int r = 0, k; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch +2 -5
@@ -1,7 +1,7 @@ -From dad7f897c0de654fa5592fda3e90f874639849f9 Mon Sep 17 00:00:00 2001 +From b2c98ef636ac7dfdf86e7a42aebc3142a5b167d2 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH 05/22] add missing FTW_ macros for musl +Subject: [PATCH] add missing FTW_ macros for musl This is to avoid build failures like below for musl.
@@ -39,6 +39,3 @@ index 8684d064ec..70fc2b5376 100644 static char **list_nftw = NULL; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch +4 -7
@@ -1,7 +1,7 @@ -From 96e975a2412a20e5f80bd3ab144057d275eb8597 Mon Sep 17 00:00:00 2001 +From 3ea46787827fb6db631b240589d2f447b977f7d9 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:12:41 +0800 -Subject: [PATCH 06/22] Use uintmax_t for handling rlim_t +Subject: [PATCH] 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
@@ -86,10 +86,10 @@ index c1f0b2b974..61c5412582 100644 return 1; } diff --git a/src/core/execute.c b/src/core/execute.c -index bd3da0c401..df1870fd2f 100644 +index 7d27f80834..bde0f8137c 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -1045,9 +1045,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -1042,9 +1042,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,6 +101,3 @@ index bd3da0c401..df1870fd2f 100644 } if (c->ioprio_set) { --- -2.34.1 -
meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +7 -10
@@ -1,7 +1,7 @@ -From 4842cff4f1329f0b5034b529d56f8ad1f234ac4c Mon Sep 17 00:00:00 2001 +From 0e51be93aa8c647bf1761d684c722b92d3cfabc1 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <[email protected]> Date: Tue, 10 Oct 2017 14:33:30 -0700 -Subject: [PATCH 07/22] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() +Subject: [PATCH] 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 1023ab73ca..c78ff6f27f 100644 +index 6a1e2e76d1..c3f7235e09 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]);
@@ -64,10 +64,10 @@ index 1023ab73ca..c78ff6f27f 100644 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 569ef466c3..7ae921a113 100644 +index 0d5075e1e6..dc59a9582c 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c -@@ -145,7 +145,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { +@@ -137,7 +137,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { /* The "root" parameter is decoration only – it's only used as part of log messages */ for (size_t i = 0; i < ELEMENTSOF(table); i++) {
@@ -76,7 +76,7 @@ index 569ef466c3..7ae921a113 100644 continue; if (table[i].target) { /* Create as symlink? */ -@@ -153,7 +153,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { +@@ -145,7 +145,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { /* check if one of the targets exists */ NULSTR_FOREACH(s, table[i].target) {
@@ -85,7 +85,7 @@ index 569ef466c3..7ae921a113 100644 continue; /* check if a specific file exists at the target path */ -@@ -164,7 +164,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { +@@ -156,7 +156,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { if (!p) return log_oom();
@@ -94,6 +94,3 @@ index 569ef466c3..7ae921a113 100644 continue; } --- -2.34.1 -
meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch +2 -6
@@ -1,8 +1,7 @@ -From bab07e779ff23d5593bb118efaaa31b60a6dce87 Mon Sep 17 00:00:00 2001 +From 9f85e2db2b40313de555b3103aa485b9b84382fe Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sun, 27 May 2018 08:36:44 -0700 -Subject: [PATCH 08/22] Define glibc compatible basename() for non-glibc - systems +Subject: [PATCH] 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
@@ -29,6 +28,3 @@ index b6d8be3083..0a29036c4c 100644 static inline char* strstr_ptr(const char *haystack, const char *needle) { if (!haystack || !needle) return NULL; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch +1 -4
@@ -1,4 +1,4 @@ -From 5712d56f1cd654d2e5d2e9117ff77fe4c299f76b Mon Sep 17 00:00:00 2001 +From c223945b20aadd1e3b1f3986e159cb3755aabf99 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
@@ -38,6 +38,3 @@ index cb58d8243b..000bdf6165 100755 ;; *) usage ;; --- -2.39.2 -
meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +3 -6
@@ -1,7 +1,7 @@ -From 25093c5017725b8577c444dfea0f42ad85b43522 Mon Sep 17 00:00:00 2001 +From 64b98f7ba1f5211bd19cd98c9d7e4d0f884cf65d Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Wed, 4 Jul 2018 15:00:44 +0800 -Subject: [PATCH 09/22] Do not disable buffering when writing to oom_score_adj +Subject: [PATCH] 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,7 +24,7 @@ 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 201c5596ae..ea51595b6c 100644 +index 4492e7ded2..b61a2aba74 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -1716,7 +1716,7 @@ int set_oom_score_adjust(int value) {
@@ -36,6 +36,3 @@ index 201c5596ae..ea51595b6c 100644 } int get_oom_score_adjust(int *ret) { --- -2.34.1 -
meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +5 -8
@@ -1,7 +1,7 @@ -From 2adbe9773cd65c48eec9df96868d4a738927c8d9 Mon Sep 17 00:00:00 2001 +From bc75e47baaddbd629d9757a2539102649d9501fd Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH 10/22] distinguish XSI-compliant strerror_r from GNU-specifi +Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different.
@@ -24,10 +24,10 @@ Signed-off-by: Chen Qi <[email protected]> 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index 77b2e1a0fd..fdba0e0142 100644 +index f415797700..a5c6e9a3bd 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c -@@ -408,7 +408,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { +@@ -410,7 +410,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { return; errno = 0;
@@ -40,7 +40,7 @@ index 77b2e1a0fd..fdba0e0142 100644 if (errno == ERANGE || strlen(x) >= k - 1) { free(m); k *= 2; -@@ -593,8 +598,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static +@@ -595,8 +600,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static if (e && e->message) return e->message;
@@ -71,6 +71,3 @@ index 69a2eb6404..1561859650 100644 if (errno == 0) { char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch +2 -5
@@ -1,7 +1,7 @@ -From 49c446cfb78cf74a909bed8c3798b77a5469866a Mon Sep 17 00:00:00 2001 +From e8a03df3275aef82a1bfd5c1ce60058c5e39eb09 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH 11/22] avoid redefinition of prctl_mm_map structure +Subject: [PATCH] avoid redefinition of prctl_mm_map structure Fix the following compile failure: error: redefinition of 'struct prctl_mm_map'
@@ -27,6 +27,3 @@ index 7d9e395c92..88c2d7dfac 100644 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ #ifndef PR_CAP_AMBIENT --- -2.34.1 -
meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch +28 -31
203 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch +2 -5
@@ -1,7 +1,7 @@ -From 2f90f8463423cfbb7e83fcef42f1071018c3b56e Mon Sep 17 00:00:00 2001 +From db390dc6bfa0a7b27010e0dcd25f45f17a6e3954 Mon Sep 17 00:00:00 2001 From: Scott Murray <[email protected]> Date: Fri, 13 Sep 2019 19:26:27 -0400 -Subject: [PATCH 13/22] Handle __cpu_mask usage +Subject: [PATCH] Handle __cpu_mask usage Fixes errors:
@@ -55,6 +55,3 @@ index ea0c58770e..b65c0bd370 100644 /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ --- -2.34.1 -
meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch +3 -6
@@ -1,7 +1,7 @@ -From b7c827bb44edbb6251c9fcdb80aa03982c0e7bf3 Mon Sep 17 00:00:00 2001 +From 0019ddcc5c415df52504dd2b779b5acb19e4084d Mon Sep 17 00:00:00 2001 From: Alex Kiernan <[email protected]> Date: Tue, 10 Mar 2020 11:05:20 +0000 -Subject: [PATCH 14/22] Handle missing gshadow +Subject: [PATCH] Handle missing gshadow gshadow usage is now present in the userdb code. Mask all uses of it to allow compilation on musl
@@ -138,7 +138,7 @@ index 22ab04d6ee..4e52e7a911 100644 #include <shadow.h> diff --git a/src/shared/userdb.c b/src/shared/userdb.c -index f60d48ace4..e878199a28 100644 +index 98066bb81d..47dc4dd420 100644 --- a/src/shared/userdb.c +++ b/src/shared/userdb.c @@ -1038,13 +1038,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
@@ -168,6 +168,3 @@ index f60d48ace4..e878199a28 100644 if (r < 0) return r; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch +5 -8
@@ -1,7 +1,7 @@ -From 3dc9d9d410bcce54fddfd94f43f7f77f3aa8e281 Mon Sep 17 00:00:00 2001 +From eb4095a963a51a1b3de693f8cf0ac27304f30d24 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 12 Apr 2021 23:44:53 -0700 -Subject: [PATCH 15/22] missing_syscall.h: Define MIPS ABI defines for musl +Subject: [PATCH] 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
@@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 7 insertions(+) diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index d795efd8f2..d6729d3c1d 100644 +index e2cd8b4e35..f2fe489de7 100644 --- a/src/basic/missing_syscall.h +++ b/src/basic/missing_syscall.h @@ -20,6 +20,12 @@
@@ -31,9 +31,9 @@ index d795efd8f2..d6729d3c1d 100644 + #include "macro.h" #include "missing_keyctl.h" - #include "missing_stat.h" + #include "missing_sched.h" diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 7ae921a113..0ef9d1fd39 100644 +index dc59a9582c..9e802ef5a5 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -20,6 +20,7 @@
@@ -44,6 +44,3 @@ index 7ae921a113..0ef9d1fd39 100644 typedef struct BaseFilesystem { const char *dir; /* directory or symlink to create */ --- -2.34.1 -
meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch +2 -5
@@ -1,7 +1,7 @@ -From 0994b59dba9f248ad31cb7087046dc00b72cb4ea Mon Sep 17 00:00:00 2001 +From c9c0cdbc37c2e0ac1917188b6f3a1ad54cbbd816 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 21 Jan 2022 15:15:11 -0800 -Subject: [PATCH 16/22] pass correct parameters to getdents64 +Subject: [PATCH] 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]
@@ -32,6 +32,3 @@ index 5e98b7a5d8..aef065047b 100644 if (n < 0) return -errno; if (n == 0) --- -2.34.1 -
meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch +7 -10
@@ -1,7 +1,7 @@ -From 3c094d443ca30f19114392fd8ef274af6eabc12d Mon Sep 17 00:00:00 2001 +From 038809fb270d11909d502d76b56bb83784ff478d Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 21 Jan 2022 22:19:37 -0800 -Subject: [PATCH 17/22] Adjust for musl headers +Subject: [PATCH] Adjust for musl headers Upstream-Status: Inappropriate [musl specific]
@@ -425,7 +425,7 @@ index 607fe0053c..9ce4005874 100644 #include "sd-dhcp-server.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c -index efbae6d868..1ea2151d50 100644 +index 8945827862..7571429523 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -3,7 +3,7 @@
@@ -451,7 +451,7 @@ index 32229a3fc7..662a345d6e 100644 #include "in-addr-util.h" #include "networkd-address.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index ee5f0f2c0a..ea5269a2de 100644 +index a4fa321264..0fd81a53d1 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -3,7 +3,7 @@
@@ -464,7 +464,7 @@ index ee5f0f2c0a..ea5269a2de 100644 #include <linux/netdevice.h> #include <sys/socket.h> diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c -index ab9eeb13a5..dd96fe7483 100644 +index 840ccb158d..9f2e85e32f 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -6,7 +6,7 @@
@@ -477,7 +477,7 @@ index ab9eeb13a5..dd96fe7483 100644 #include "sd-ndisc.h" diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c -index 7218d799fc..30d5574eae 100644 +index eb502ae2cf..5b25ee4523 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -1,9 +1,5 @@
@@ -502,7 +502,7 @@ index 7218d799fc..30d5574eae 100644 _cleanup_(route_freep) Route *route = NULL; diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c -index 2298f9ea3a..7d5f87de53 100644 +index 011ea1fe6e..59dfe733eb 100644 --- a/src/network/networkd-setlink.c +++ b/src/network/networkd-setlink.c @@ -2,7 +2,7 @@
@@ -567,6 +567,3 @@ index f528a46b8e..830318cda5 100644 #include <linux/netdevice.h> #include <linux/pci_regs.h> --- -2.34.1 -
meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch +3 -6
@@ -1,8 +1,8 @@ -From be02bd0876a061728661535a709d313e39fe1ac3 Mon Sep 17 00:00:00 2001 +From b771a2ed8d6e07b006710767b79475dece4d789c Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 8 Nov 2022 13:31:34 -0800 -Subject: [PATCH 18/22] test-bus-error: strerror() is assumed to be GNU - specific version mark it so +Subject: [PATCH] test-bus-error: strerror() is assumed to be GNU specific + version mark it so Upstream-Status: Inappropriate [Upstream systemd only supports glibc]
@@ -47,6 +47,3 @@ index 376d532281..967cfd4d67 100644 TEST(PROTECT_ERRNO) { errno = 12; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch +2 -5
@@ -1,7 +1,7 @@ -From 46d80840bfe37e67d4f18c37a77751ea1fe63a07 Mon Sep 17 00:00:00 2001 +From f70a8031ded3bcfe4c5f1cea4763ae257ca27be8 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 23 Jan 2023 23:39:46 -0800 -Subject: [PATCH 19/22] errno-util: Make STRERROR portable for musl +Subject: [PATCH] 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
@@ -37,6 +37,3 @@ 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.34.1 -
meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch +3 -6
@@ -1,7 +1,7 @@ -From 9eb4867b4e2dbdb2484ae854022aff97e2f0feb3 Mon Sep 17 00:00:00 2001 +From 9ae5377acfa895bfc1ea61aef4fbe754bc2f7f33 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 2 Aug 2023 12:06:27 -0700 -Subject: [PATCH 20/22] sd-event: Make malloc_trim() conditional on glibc +Subject: [PATCH] sd-event: Make malloc_trim() conditional on glibc musl does not have this API
@@ -12,7 +12,7 @@ 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 288798a0dc..6419a7f216 100644 +index 25f3b1fc4f..9ea3c964b2 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(
@@ -34,6 +34,3 @@ index 288798a0dc..6419a7f216 100644 usec_t after_timestamp = now(CLOCK_MONOTONIC); if (r > 0) --- -2.34.1 -
meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch +2 -5
@@ -1,7 +1,7 @@ -From 502597b9ddd6b145541b23fadca0b1d3ca9f6367 Mon Sep 17 00:00:00 2001 +From d814a5cae2ecbee079816e3fc7b34a59da356a3b Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 2 Aug 2023 12:20:40 -0700 -Subject: [PATCH 21/22] shared: Do not use malloc_info on musl +Subject: [PATCH] shared: Do not use malloc_info on musl Upstream-Status: Inappropriate [musl-specific] Signed-off-by: Khem Raj <[email protected]>
@@ -52,6 +52,3 @@ index 8e70e365dd..9e782caec9 100644 (void) memstream_dump(LOG_INFO, &m); break; } --- -2.34.1 -
meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch +4 -7
@@ -1,7 +1,7 @@ -From fd52f1764647e03a35e8f0ed0ef952049073ccbd Mon Sep 17 00:00:00 2001 +From e355e927950e8978a417067f25f30bf311896c96 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Tue, 2 Jan 2024 11:03:27 +0800 -Subject: [PATCH 22/22] avoid missing LOCK_EX declaration +Subject: [PATCH] avoid missing LOCK_EX declaration This only happens on MUSL. Include sys/file.h to avoid compilation error about missing LOCK_EX declaration.
@@ -15,10 +15,10 @@ Signed-off-by: Chen Qi <[email protected]> 2 files changed, 2 insertions(+) diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c -index 70d963e269..7084811439 100644 +index 308d332c15..b1c43bbc6a 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c -@@ -4,6 +4,7 @@ +@@ -5,6 +5,7 @@ #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/prctl.h>
@@ -38,6 +38,3 @@ index 5339bc4e5e..0697495f23 100644 int lock_dev_console(void); --- -2.34.1 -
meta/recipes-core/systemd/systemd_255.13.bb renamed from meta/recipes-core/systemd/systemd_255.4.bb +0 -0
Signature · 1 line
2.34.1