summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-01-09 23:27:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-11 10:53:44 +0000
commita02cdb56749a07a2bdc2699d74d0e98dbb84b304 (patch)
tree2c9609ff2304aa9421ea26f5314d5712f5685ce9 /meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
parent12c90b3c83767b3d20a411729fbb3c6ce1ef9173 (diff)
downloadpoky-a02cdb56749a07a2bdc2699d74d0e98dbb84b304.tar.gz
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>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch16
1 files changed, 8 insertions, 8 deletions
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