summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/systemd/systemd-boot_250.1.bb (renamed from meta/recipes-core/systemd/systemd-boot_249.7.bb)2
-rw-r--r--meta/recipes-core/systemd/systemd.inc4
-rw-r--r--meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch16
-rw-r--r--meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch14
-rw-r--r--meta/recipes-core/systemd/systemd_250.1.bb (renamed from meta/recipes-core/systemd/systemd_249.7.bb)1
5 files changed, 18 insertions, 19 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_249.7.bb b/meta/recipes-core/systemd/systemd-boot_250.1.bb
index b3d4e31e08..23a64bf30d 100644
--- a/meta/recipes-core/systemd/systemd-boot_249.7.bb
+++ b/meta/recipes-core/systemd/systemd-boot_250.1.bb
@@ -20,7 +20,7 @@ EOF
20} 20}
21 21
22# need to use ${HOST_PREFIX} here, otherwise ld.bfd could be used from HOSTTOOLS_NONFATAL 22# need to use ${HOST_PREFIX} here, otherwise ld.bfd could be used from HOSTTOOLS_NONFATAL
23EFI_LD = "${HOST_PREFIX}ld.bfd" 23EFI_LD = "bfd"
24 24
25EXTRA_OEMESON += "-Defi=true \ 25EXTRA_OEMESON += "-Defi=true \
26 -Dgnu-efi=true \ 26 -Dgnu-efi=true \
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index b77f847abd..e416f8d64b 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1"
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 = "d4406e94a32d423d8a73deb7757fb09890afe2c4" 17SRCREV = "402280118fe082122437638f53a0019c4aea81aa"
18SRCBRANCH = "v249-stable" 18SRCBRANCH = "v250-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" 20"
21 21
diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
index d3af734e06..330ad492ba 100644
--- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
@@ -1,4 +1,4 @@
1From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001 1From f9974d7dc289551bfbf823b716fd32b43c54e465 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 21 Feb 2019 16:23:24 +0800 3Date: Thu, 21 Feb 2019 16:23:24 +0800
4Subject: [PATCH] binfmt: Don't install dependency links at install time for 4Subject: [PATCH] binfmt: Don't install dependency links at install time for
@@ -26,10 +26,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
26 3 files changed, 9 insertions(+), 4 deletions(-) 26 3 files changed, 9 insertions(+), 4 deletions(-)
27 27
28diff --git a/units/meson.build b/units/meson.build 28diff --git a/units/meson.build b/units/meson.build
29index 17e9ead9c1..e5502be620 100644 29index a9bf28f6d9..11d3644168 100644
30--- a/units/meson.build 30--- a/units/meson.build
31+++ b/units/meson.build 31+++ b/units/meson.build
32@@ -59,8 +59,7 @@ units = [ 32@@ -63,8 +63,7 @@ units = [
33 ['poweroff.target', '', 33 ['poweroff.target', '',
34 (with_runlevels ? 'runlevel0.target' : '')], 34 (with_runlevels ? 'runlevel0.target' : '')],
35 ['printer.target', ''], 35 ['printer.target', ''],
@@ -39,14 +39,14 @@ index 17e9ead9c1..e5502be620 100644
39 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], 39 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'],
40 ['reboot.target', '', 40 ['reboot.target', '',
41 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], 41 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')],
42@@ -178,8 +177,7 @@ in_units = [ 42@@ -184,8 +183,7 @@ in_units = [
43 ['rescue.service', ''], 43 ['rescue.service', ''],
44 ['serial-getty@.service', ''], 44 ['serial-getty@.service', ''],
45 ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], 45 ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'],
46- ['systemd-binfmt.service', 'ENABLE_BINFMT', 46- ['systemd-binfmt.service', 'ENABLE_BINFMT',
47- 'sysinit.target.wants/'], 47- 'sysinit.target.wants/'],
48+ ['systemd-binfmt.service', 'ENABLE_BINFMT'], 48+ ['systemd-binfmt.service', 'ENABLE_BINFMT'],
49 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], 49 ['systemd-bless-boot.service', 'HAVE_GNU_EFI HAVE_BLKID'],
50 ['systemd-boot-check-no-failures.service', ''], 50 ['systemd-boot-check-no-failures.service', ''],
51 ['systemd-coredump@.service', 'ENABLE_COREDUMP'], 51 ['systemd-coredump@.service', 'ENABLE_COREDUMP'],
52diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount 52diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
@@ -61,7 +61,7 @@ index 172c8757ab..f65d8930c6 100644
61+[Install] 61+[Install]
62+WantedBy=sysinit.target 62+WantedBy=sysinit.target
63diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in 63diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
64index fdafce7ff7..4efc05e495 100644 64index 96f595ad72..7c010bb224 100644
65--- a/units/systemd-binfmt.service.in 65--- a/units/systemd-binfmt.service.in
66+++ b/units/systemd-binfmt.service.in 66+++ b/units/systemd-binfmt.service.in
67@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm 67@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
@@ -71,8 +71,8 @@ index fdafce7ff7..4efc05e495 100644
71+Wants=proc-sys-fs-binfmt_misc.automount 71+Wants=proc-sys-fs-binfmt_misc.automount
72 After=proc-sys-fs-binfmt_misc.automount 72 After=proc-sys-fs-binfmt_misc.automount
73 After=proc-sys-fs-binfmt_misc.mount 73 After=proc-sys-fs-binfmt_misc.mount
74 Before=sysinit.target shutdown.target 74 After=local-fs.target
75@@ -30,3 +31,6 @@ RemainAfterExit=yes 75@@ -31,3 +32,6 @@ RemainAfterExit=yes
76 ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt 76 ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt
77 ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister 77 ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister
78 TimeoutSec=90s 78 TimeoutSec=90s
diff --git a/meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch b/meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch
index 3af1daac9c..898e8af904 100644
--- a/meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch
+++ b/meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch
@@ -1,4 +1,4 @@
1From 1adde6721ead386ccee6efe48038d6944b96319a Mon Sep 17 00:00:00 2001 1From 93c7e482d39cf7765974b3c729d29c1b120a60e3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 24 May 2021 18:26:27 -0700 3Date: Mon, 24 May 2021 18:26:27 -0700
4Subject: [PATCH] test-parse-argument: Include signal.h 4Subject: [PATCH] test-parse-argument: Include signal.h
@@ -8,22 +8,20 @@ src/test/test-parse-argument.c:49:29: error: use of undeclared identifier 'SIGAB
8 8
9Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19718] 9Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19718]
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
11--- 12---
12 src/test/test-parse-argument.c | 1 + 13 src/test/test-parse-argument.c | 1 +
13 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
14 15
15diff --git a/src/test/test-parse-argument.c b/src/test/test-parse-argument.c 16diff --git a/src/test/test-parse-argument.c b/src/test/test-parse-argument.c
16index 4081a9f25a..820d69f092 100644 17index cf3d54288a..15104e5282 100644
17--- a/src/test/test-parse-argument.c 18--- a/src/test/test-parse-argument.c
18+++ b/src/test/test-parse-argument.c 19+++ b/src/test/test-parse-argument.c
19@@ -3,6 +3,7 @@ 20@@ -5,6 +5,7 @@
20 #include "parse-argument.h" 21 #include "parse-argument.h"
21 #include "stdio-util.h" 22 #include "stdio-util.h"
22 #include "tests.h" 23 #include "tests.h"
23+#include <signal.h> 24+#include <signal.h>
24 25
25 static void test_parse_json_argument(void) { 26 TEST(parse_json_argument) {
26 log_info("/* %s */", __func__); 27 JsonFormatFlags flags = JSON_FORMAT_PRETTY;
27--
282.31.1
29
diff --git a/meta/recipes-core/systemd/systemd_249.7.bb b/meta/recipes-core/systemd/systemd_250.1.bb
index 53e7f6738d..b05905b764 100644
--- a/meta/recipes-core/systemd/systemd_249.7.bb
+++ b/meta/recipes-core/systemd/systemd_250.1.bb
@@ -688,6 +688,7 @@ FILES:udev += "${base_sbindir}/udevd \
688 ${rootlibexecdir}/udev/rules.d/60-serial.rules \ 688 ${rootlibexecdir}/udev/rules.d/60-serial.rules \
689 ${rootlibexecdir}/udev/rules.d/61-autosuspend-manual.rules \ 689 ${rootlibexecdir}/udev/rules.d/61-autosuspend-manual.rules \
690 ${rootlibexecdir}/udev/rules.d/64-btrfs.rules \ 690 ${rootlibexecdir}/udev/rules.d/64-btrfs.rules \
691 ${rootlibexecdir}/udev/rules.d/70-camera.rules \
691 ${rootlibexecdir}/udev/rules.d/70-joystick.rules \ 692 ${rootlibexecdir}/udev/rules.d/70-joystick.rules \
692 ${rootlibexecdir}/udev/rules.d/70-memory.rules \ 693 ${rootlibexecdir}/udev/rules.d/70-memory.rules \
693 ${rootlibexecdir}/udev/rules.d/70-mouse.rules \ 694 ${rootlibexecdir}/udev/rules.d/70-mouse.rules \