summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-04-14 10:18:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-04-20 11:56:05 +0100
commitd8e9c1c0496283b36cd1b76b21e0538a45201524 (patch)
treedc771d4ce91fbce3b3681e2f877207154748adee
parentff633ce7a7ffc0d39b86043caeb63a9ffcef99b8 (diff)
downloadpoky-d8e9c1c0496283b36cd1b76b21e0538a45201524.tar.gz
systemd: upgrade 253.1 -> 253.3
Changelog: https://github.com/systemd/systemd-stable/blob/v253.3/NEWS 0025-systemctl-explicitly-cast-the-constants-to-uint64_t.patch removed since it's included in 253.3 (From OE-Core rev: 37ca7f59245c31b483db01f2e1050ba979768b1b) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd-boot_253.3.bb (renamed from meta/recipes-core/systemd/systemd-boot_253.1.bb)0
-rw-r--r--meta/recipes-core/systemd/systemd.inc3
-rw-r--r--meta/recipes-core/systemd/systemd/0025-systemctl-explicitly-cast-the-constants-to-uint64_t.patch44
-rw-r--r--meta/recipes-core/systemd/systemd_253.3.bb (renamed from meta/recipes-core/systemd/systemd_253.1.bb)0
4 files changed, 1 insertions, 46 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_253.1.bb b/meta/recipes-core/systemd/systemd-boot_253.3.bb
index b67706b731..b67706b731 100644
--- a/meta/recipes-core/systemd/systemd-boot_253.1.bb
+++ b/meta/recipes-core/systemd/systemd-boot_253.3.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 14608f9abc..d50f2c9cba 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,11 +14,10 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ 14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" 15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
16 16
17SRCREV = "6c327d74aa0d350482e82a247d7018559699798d" 17SRCREV = "ed18c2ab79e8b94182d5dcf31d58457763f3e3e1"
18SRCBRANCH = "v253-stable" 18SRCBRANCH = "v253-stable"
19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ 19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
20 file://0026-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch \ 20 file://0026-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch \
21 file://0025-systemctl-explicitly-cast-the-constants-to-uint64_t.patch \
22 " 21 "
23 22
24S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/systemd/systemd/0025-systemctl-explicitly-cast-the-constants-to-uint64_t.patch b/meta/recipes-core/systemd/systemd/0025-systemctl-explicitly-cast-the-constants-to-uint64_t.patch
deleted file mode 100644
index d840de870f..0000000000
--- a/meta/recipes-core/systemd/systemd/0025-systemctl-explicitly-cast-the-constants-to-uint64_t.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From fad29ce1f5cc7b12bc13671d9ad80775771a67eb Mon Sep 17 00:00:00 2001
2From: Frantisek Sumsal <frantisek@sumsal.cz>
3Date: Fri, 3 Mar 2023 12:17:27 +0100
4Subject: [PATCH] systemctl: explicitly cast the constants to uint64_t
5
6Otherwise under certain conditions `va_arg()` might get garbage instead
7of the expected value, i.e.:
8
9$ sudo build-o0/systemctl disable asdfasfaf
10sd_bus_message_appendv: Got uint64_t: 0
11Failed to disable unit: Unit file asdfasfaf.service does not exist.
12
13$ sudo build-o1/systemctl disable asdfasfaf
14sd_bus_message_appendv: Got uint64_t: 7954875719681572864
15Failed to disable unit: Invalid argument
16
17(reproduced on an armv7hl machine)
18
19Resolves: #26568
20Follow-up to: bf1bea43f15
21Related issue: https://github.com/systemd/systemd/pull/14470#discussion_r362893735
22
23Upstream-Status: Backport [https://github.com/systemd/systemd/commit/c63bfd0884cf20e48befbee49d41f667660a8802]
24Signed-off-by: Alexander Kanavin <alex@linutronix.de>
25---
26 src/systemctl/systemctl-enable.c | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c
30index 86d9f602fa..f94a286122 100644
31--- a/src/systemctl/systemctl-enable.c
32+++ b/src/systemctl/systemctl-enable.c
33@@ -211,7 +211,7 @@ int verb_enable(int argc, char *argv[], void *userdata) {
34
35 if (send_runtime) {
36 if (streq(method, "DisableUnitFilesWithFlagsAndInstallInfo"))
37- r = sd_bus_message_append(m, "t", arg_runtime ? UNIT_FILE_RUNTIME : 0);
38+ r = sd_bus_message_append(m, "t", arg_runtime ? (uint64_t) UNIT_FILE_RUNTIME : UINT64_C(0));
39 else
40 r = sd_bus_message_append(m, "b", arg_runtime);
41 if (r < 0)
42--
432.39.2
44
diff --git a/meta/recipes-core/systemd/systemd_253.1.bb b/meta/recipes-core/systemd/systemd_253.3.bb
index 9c2b96d3c1..9c2b96d3c1 100644
--- a/meta/recipes-core/systemd/systemd_253.1.bb
+++ b/meta/recipes-core/systemd/systemd_253.3.bb