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.patch81
1 files changed, 0 insertions, 81 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
deleted file mode 100644
index 8dd22eeb7b..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 21 Feb 2019 16:23:24 +0800
4Subject: [PATCH] binfmt: Don't install dependency links at install time for
5 the binfmt services
6
7use [Install] blocks so that they get created when the service is enabled
8like a traditional service.
9
10The [Install] blocks were rejected upstream as they don't have a way to
11"enable" it on install without static symlinks which can't be disabled,
12only masked. We however can do that in a postinst.
13
14Upstream-Status: Denied
15
16Signed-off-by: Ross Burton <ross.burton@intel.com>
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
19[rebased for systemd 243]
20Signed-off-by: Scott Murray <scott.murray@konsulko.com>
21
22---
23 units/meson.build | 6 ++----
24 units/proc-sys-fs-binfmt_misc.automount | 3 +++
25 units/systemd-binfmt.service.in | 4 ++++
26 3 files changed, 9 insertions(+), 4 deletions(-)
27
28Index: systemd-stable/units/meson.build
29===================================================================
30--- systemd-stable.orig/units/meson.build
31+++ systemd-stable/units/meson.build
32@@ -55,8 +55,7 @@ units = [
33 ['poweroff.target', '',
34 (with_runlevels ? 'runlevel0.target' : '')],
35 ['printer.target', ''],
36- ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT',
37- 'sysinit.target.wants/'],
38+ ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT'],
39 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'],
40 ['reboot.target', '',
41 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')],
42@@ -166,8 +165,7 @@ in_units = [
43 ['rc-local.service', 'HAVE_SYSV_COMPAT'],
44 ['rescue.service', ''],
45 ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'],
46- ['systemd-binfmt.service', 'ENABLE_BINFMT',
47- 'sysinit.target.wants/'],
48+ ['systemd-binfmt.service', 'ENABLE_BINFMT'],
49 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'],
50 ['systemd-boot-check-no-failures.service', ''],
51 ['systemd-coredump@.service', 'ENABLE_COREDUMP'],
52Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount
53===================================================================
54--- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount
55+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount
56@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
57
58 [Automount]
59 Where=/proc/sys/fs/binfmt_misc
60+
61+[Install]
62+WantedBy=sysinit.target
63Index: systemd-stable/units/systemd-binfmt.service.in
64===================================================================
65--- systemd-stable.orig/units/systemd-binfmt.service.in
66+++ systemd-stable/units/systemd-binfmt.service.in
67@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
68 Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
69 DefaultDependencies=no
70 Conflicts=shutdown.target
71+Wants=proc-sys-fs-binfmt_misc.automount
72 After=proc-sys-fs-binfmt_misc.automount
73 After=proc-sys-fs-binfmt_misc.mount
74 Before=sysinit.target shutdown.target
75@@ -30,3 +31,6 @@ RemainAfterExit=yes
76 ExecStart=@rootlibexecdir@/systemd-binfmt
77 ExecStop=@rootlibexecdir@/systemd-binfmt --unregister
78 TimeoutSec=90s
79+
80+[Install]
81+WantedBy=sysinit.target