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.patch22
1 files changed, 11 insertions, 11 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 e24e7f83fc..00670ca2b1 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,7 +1,7 @@
1From 87dd61be2e28e78ce4f9f173794812e6c2d904d1 Mon Sep 17 00:00:00 2001 1From 98254e4798e79d52ac6b562616cd244120f6e239 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 27 Jun 2018 16:01:22 +0800 3Date: Thu, 21 Feb 2019 16:23:24 +0800
4Subject: [PATCH 1/9] binfmt: Don't install dependency links at install time 4Subject: [PATCH 1/5] binfmt: Don't install dependency links at install time
5 for the binfmt services 5 for the binfmt services
6 6
7use [Install] blocks so that they get created when the service is enabled 7use [Install] blocks so that they get created when the service is enabled
@@ -23,10 +23,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
23 3 files changed, 9 insertions(+), 4 deletions(-) 23 3 files changed, 9 insertions(+), 4 deletions(-)
24 24
25diff --git a/units/meson.build b/units/meson.build 25diff --git a/units/meson.build b/units/meson.build
26index e4ac6ced6..698734e44 100644 26index d695084..7b1f14a 100644
27--- a/units/meson.build 27--- a/units/meson.build
28+++ b/units/meson.build 28+++ b/units/meson.build
29@@ -46,8 +46,7 @@ units = [ 29@@ -47,8 +47,7 @@ units = [
30 ['poweroff.target', '', 30 ['poweroff.target', '',
31 'runlevel0.target'], 31 'runlevel0.target'],
32 ['printer.target', ''], 32 ['printer.target', ''],
@@ -36,18 +36,18 @@ index e4ac6ced6..698734e44 100644
36 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], 36 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'],
37 ['reboot.target', '', 37 ['reboot.target', '',
38 'runlevel6.target ctrl-alt-del.target'], 38 'runlevel6.target ctrl-alt-del.target'],
39@@ -130,8 +129,7 @@ in_units = [ 39@@ -134,8 +133,7 @@ in_units = [
40 ['systemd-ask-password-console.service', ''], 40 ['systemd-ask-password-console.service', ''],
41 ['systemd-ask-password-wall.service', ''], 41 ['systemd-ask-password-wall.service', ''],
42 ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], 42 ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'],
43- ['systemd-binfmt.service', 'ENABLE_BINFMT', 43- ['systemd-binfmt.service', 'ENABLE_BINFMT',
44- 'sysinit.target.wants/'], 44- 'sysinit.target.wants/'],
45+ ['systemd-binfmt.service', 'ENABLE_BINFMT'], 45+ ['systemd-binfmt.service', 'ENABLE_BINFMT'],
46 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'],
47 ['systemd-boot-check-no-failures.service', ''],
46 ['systemd-coredump@.service', 'ENABLE_COREDUMP'], 48 ['systemd-coredump@.service', 'ENABLE_COREDUMP'],
47 ['systemd-exit.service', ''],
48 ['systemd-firstboot.service', 'ENABLE_FIRSTBOOT',
49diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount 49diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
50index 30a6bc991..4231f3b70 100644 50index 30a6bc9..4231f3b 100644
51--- a/units/proc-sys-fs-binfmt_misc.automount 51--- a/units/proc-sys-fs-binfmt_misc.automount
52+++ b/units/proc-sys-fs-binfmt_misc.automount 52+++ b/units/proc-sys-fs-binfmt_misc.automount
53@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ 53@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
@@ -58,7 +58,7 @@ index 30a6bc991..4231f3b70 100644
58+[Install] 58+[Install]
59+WantedBy=sysinit.target 59+WantedBy=sysinit.target
60diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in 60diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
61index e940c7c9a..6be7f5cc9 100644 61index e940c7c..6be7f5c 100644
62--- a/units/systemd-binfmt.service.in 62--- a/units/systemd-binfmt.service.in
63+++ b/units/systemd-binfmt.service.in 63+++ b/units/systemd-binfmt.service.in
64@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm 64@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
@@ -77,5 +77,5 @@ index e940c7c9a..6be7f5cc9 100644
77+[Install] 77+[Install]
78+WantedBy=sysinit.target 78+WantedBy=sysinit.target
79-- 79--
802.11.0 802.7.4
81 81