summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
diff options
context:
space:
mode:
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.patch17
1 files changed, 8 insertions, 9 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 00670ca2b1..73e65ff798 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
@@ -16,6 +16,8 @@ Upstream-Status: Denied
16Signed-off-by: Ross Burton <ross.burton@intel.com> 16Signed-off-by: Ross Burton <ross.burton@intel.com>
17Signed-off-by: Khem Raj <raj.khem@gmail.com> 17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 18Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
19[rebased for systemd 243]
20Signed-off-by: Scott Murray <scott.murray@konsulko.com>
19--- 21---
20 units/meson.build | 6 ++---- 22 units/meson.build | 6 ++----
21 units/proc-sys-fs-binfmt_misc.automount | 3 +++ 23 units/proc-sys-fs-binfmt_misc.automount | 3 +++
@@ -23,10 +25,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
23 3 files changed, 9 insertions(+), 4 deletions(-) 25 3 files changed, 9 insertions(+), 4 deletions(-)
24 26
25diff --git a/units/meson.build b/units/meson.build 27diff --git a/units/meson.build b/units/meson.build
26index d695084..7b1f14a 100644 28index e1ee9f86c3..6bb7771b36 100644
27--- a/units/meson.build 29--- a/units/meson.build
28+++ b/units/meson.build 30+++ b/units/meson.build
29@@ -47,8 +47,7 @@ units = [ 31@@ -46,8 +46,7 @@ units = [
30 ['poweroff.target', '', 32 ['poweroff.target', '',
31 'runlevel0.target'], 33 'runlevel0.target'],
32 ['printer.target', ''], 34 ['printer.target', ''],
@@ -36,7 +38,7 @@ index d695084..7b1f14a 100644
36 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], 38 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'],
37 ['reboot.target', '', 39 ['reboot.target', '',
38 'runlevel6.target ctrl-alt-del.target'], 40 'runlevel6.target ctrl-alt-del.target'],
39@@ -134,8 +133,7 @@ in_units = [ 41@@ -130,8 +129,7 @@ in_units = [
40 ['systemd-ask-password-console.service', ''], 42 ['systemd-ask-password-console.service', ''],
41 ['systemd-ask-password-wall.service', ''], 43 ['systemd-ask-password-wall.service', ''],
42 ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], 44 ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'],
@@ -45,9 +47,9 @@ index d695084..7b1f14a 100644
45+ ['systemd-binfmt.service', 'ENABLE_BINFMT'], 47+ ['systemd-binfmt.service', 'ENABLE_BINFMT'],
46 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], 48 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'],
47 ['systemd-boot-check-no-failures.service', ''], 49 ['systemd-boot-check-no-failures.service', ''],
48 ['systemd-coredump@.service', 'ENABLE_COREDUMP'], 50 ['systemd-boot-system-token.service', 'ENABLE_EFI',
49diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount 51diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
50index 30a6bc9..4231f3b 100644 52index 30a6bc9918..4231f3b70f 100644
51--- a/units/proc-sys-fs-binfmt_misc.automount 53--- a/units/proc-sys-fs-binfmt_misc.automount
52+++ b/units/proc-sys-fs-binfmt_misc.automount 54+++ b/units/proc-sys-fs-binfmt_misc.automount
53@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ 55@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
@@ -58,7 +60,7 @@ index 30a6bc9..4231f3b 100644
58+[Install] 60+[Install]
59+WantedBy=sysinit.target 61+WantedBy=sysinit.target
60diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in 62diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
61index e940c7c..6be7f5c 100644 63index e940c7c9ad..6be7f5cc9b 100644
62--- a/units/systemd-binfmt.service.in 64--- a/units/systemd-binfmt.service.in
63+++ b/units/systemd-binfmt.service.in 65+++ b/units/systemd-binfmt.service.in
64@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm 66@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
@@ -76,6 +78,3 @@ index e940c7c..6be7f5c 100644
76+ 78+
77+[Install] 79+[Install]
78+WantedBy=sysinit.target 80+WantedBy=sysinit.target
79--
802.7.4
81