mirror of
https://git.yoctoproject.org/poky
synced 2026-04-22 15:32:14 +02:00
systemd: update 249.7 -> 250.1
(From OE-Core rev: e22188e47d2fce2406d9db9c95289b3878eda69f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
12c90b3c83
commit
a02cdb5674
@@ -20,7 +20,7 @@ EOF
|
||||
}
|
||||
|
||||
# need to use ${HOST_PREFIX} here, otherwise ld.bfd could be used from HOSTTOOLS_NONFATAL
|
||||
EFI_LD = "${HOST_PREFIX}ld.bfd"
|
||||
EFI_LD = "bfd"
|
||||
|
||||
EXTRA_OEMESON += "-Defi=true \
|
||||
-Dgnu-efi=true \
|
||||
@@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
|
||||
file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRCREV = "d4406e94a32d423d8a73deb7757fb09890afe2c4"
|
||||
SRCBRANCH = "v249-stable"
|
||||
SRCREV = "402280118fe082122437638f53a0019c4aea81aa"
|
||||
SRCBRANCH = "v250-stable"
|
||||
SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
|
||||
"
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001
|
||||
From f9974d7dc289551bfbf823b716fd32b43c54e465 Mon Sep 17 00:00:00 2001
|
||||
From: Chen Qi <Qi.Chen@windriver.com>
|
||||
Date: Thu, 21 Feb 2019 16:23:24 +0800
|
||||
Subject: [PATCH] binfmt: Don't install dependency links at install time for
|
||||
@@ -26,10 +26,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
|
||||
3 files changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/units/meson.build b/units/meson.build
|
||||
index 17e9ead9c1..e5502be620 100644
|
||||
index a9bf28f6d9..11d3644168 100644
|
||||
--- a/units/meson.build
|
||||
+++ b/units/meson.build
|
||||
@@ -59,8 +59,7 @@ units = [
|
||||
@@ -63,8 +63,7 @@ units = [
|
||||
['poweroff.target', '',
|
||||
(with_runlevels ? 'runlevel0.target' : '')],
|
||||
['printer.target', ''],
|
||||
@@ -39,14 +39,14 @@ index 17e9ead9c1..e5502be620 100644
|
||||
['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'],
|
||||
['reboot.target', '',
|
||||
'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')],
|
||||
@@ -178,8 +177,7 @@ in_units = [
|
||||
@@ -184,8 +183,7 @@ in_units = [
|
||||
['rescue.service', ''],
|
||||
['serial-getty@.service', ''],
|
||||
['systemd-backlight@.service', 'ENABLE_BACKLIGHT'],
|
||||
- ['systemd-binfmt.service', 'ENABLE_BINFMT',
|
||||
- 'sysinit.target.wants/'],
|
||||
+ ['systemd-binfmt.service', 'ENABLE_BINFMT'],
|
||||
['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'],
|
||||
['systemd-bless-boot.service', 'HAVE_GNU_EFI HAVE_BLKID'],
|
||||
['systemd-boot-check-no-failures.service', ''],
|
||||
['systemd-coredump@.service', 'ENABLE_COREDUMP'],
|
||||
diff --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
|
||||
+[Install]
|
||||
+WantedBy=sysinit.target
|
||||
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
|
||||
index fdafce7ff7..4efc05e495 100644
|
||||
index 96f595ad72..7c010bb224 100644
|
||||
--- a/units/systemd-binfmt.service.in
|
||||
+++ b/units/systemd-binfmt.service.in
|
||||
@@ -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
|
||||
+Wants=proc-sys-fs-binfmt_misc.automount
|
||||
After=proc-sys-fs-binfmt_misc.automount
|
||||
After=proc-sys-fs-binfmt_misc.mount
|
||||
Before=sysinit.target shutdown.target
|
||||
@@ -30,3 +31,6 @@ RemainAfterExit=yes
|
||||
After=local-fs.target
|
||||
@@ -31,3 +32,6 @@ RemainAfterExit=yes
|
||||
ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt
|
||||
ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister
|
||||
TimeoutSec=90s
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 1adde6721ead386ccee6efe48038d6944b96319a Mon Sep 17 00:00:00 2001
|
||||
From 93c7e482d39cf7765974b3c729d29c1b120a60e3 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 24 May 2021 18:26:27 -0700
|
||||
Subject: [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
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19718]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
---
|
||||
src/test/test-parse-argument.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/test/test-parse-argument.c b/src/test/test-parse-argument.c
|
||||
index 4081a9f25a..820d69f092 100644
|
||||
index cf3d54288a..15104e5282 100644
|
||||
--- a/src/test/test-parse-argument.c
|
||||
+++ b/src/test/test-parse-argument.c
|
||||
@@ -3,6 +3,7 @@
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "parse-argument.h"
|
||||
#include "stdio-util.h"
|
||||
#include "tests.h"
|
||||
+#include <signal.h>
|
||||
|
||||
static void test_parse_json_argument(void) {
|
||||
log_info("/* %s */", __func__);
|
||||
--
|
||||
2.31.1
|
||||
|
||||
TEST(parse_json_argument) {
|
||||
JsonFormatFlags flags = JSON_FORMAT_PRETTY;
|
||||
|
||||
@@ -688,6 +688,7 @@ FILES:udev += "${base_sbindir}/udevd \
|
||||
${rootlibexecdir}/udev/rules.d/60-serial.rules \
|
||||
${rootlibexecdir}/udev/rules.d/61-autosuspend-manual.rules \
|
||||
${rootlibexecdir}/udev/rules.d/64-btrfs.rules \
|
||||
${rootlibexecdir}/udev/rules.d/70-camera.rules \
|
||||
${rootlibexecdir}/udev/rules.d/70-joystick.rules \
|
||||
${rootlibexecdir}/udev/rules.d/70-memory.rules \
|
||||
${rootlibexecdir}/udev/rules.d/70-mouse.rules \
|
||||
Reference in New Issue
Block a user