diff options
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.patch | 34 |
1 files changed, 17 insertions, 17 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 26f70b35d0..2676c144f2 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 | |||
@@ -25,21 +25,21 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
25 | units/systemd-binfmt.service.in | 4 ++++ | 25 | units/systemd-binfmt.service.in | 4 ++++ |
26 | 3 files changed, 9 insertions(+), 4 deletions(-) | 26 | 3 files changed, 9 insertions(+), 4 deletions(-) |
27 | 27 | ||
28 | diff --git a/units/meson.build b/units/meson.build | 28 | Index: systemd-stable/units/meson.build |
29 | index ea91f0cc9ea7..25186f88dfeb 100644 | 29 | =================================================================== |
30 | --- a/units/meson.build | 30 | --- systemd-stable.orig/units/meson.build |
31 | +++ b/units/meson.build | 31 | +++ systemd-stable/units/meson.build |
32 | @@ -52,8 +52,7 @@ units = [ | 32 | @@ -54,8 +54,7 @@ units = [ |
33 | ['poweroff.target', '', | 33 | ['poweroff.target', '', |
34 | 'runlevel0.target'], | 34 | (with_runlevels ? 'runlevel0.target' : '')], |
35 | ['printer.target', ''], | 35 | ['printer.target', ''], |
36 | - ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT', | 36 | - ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT', |
37 | - 'sysinit.target.wants/'], | 37 | - 'sysinit.target.wants/'], |
38 | + ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT'], | 38 | + ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT'], |
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 | 'runlevel6.target ctrl-alt-del.target'], | 41 | (with_runlevels ? 'runlevel6.target ctrl-alt-del.target' : 'ctrl-alt-del.target')], |
42 | @@ -161,8 +160,7 @@ in_units = [ | 42 | @@ -162,8 +161,7 @@ in_units = [ |
43 | ['rc-local.service', 'HAVE_SYSV_COMPAT'], | 43 | ['rc-local.service', 'HAVE_SYSV_COMPAT'], |
44 | ['rescue.service', ''], | 44 | ['rescue.service', ''], |
45 | ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], | 45 | ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], |
@@ -49,10 +49,10 @@ index ea91f0cc9ea7..25186f88dfeb 100644 | |||
49 | ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], | 49 | ['systemd-bless-boot.service', 'ENABLE_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'], |
52 | diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount | 52 | Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount |
53 | index 30a6bc991844..4231f3b70fe9 100644 | 53 | =================================================================== |
54 | --- a/units/proc-sys-fs-binfmt_misc.automount | 54 | --- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount |
55 | +++ b/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/ | 56 | @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ |
57 | 57 | ||
58 | [Automount] | 58 | [Automount] |
@@ -60,11 +60,11 @@ index 30a6bc991844..4231f3b70fe9 100644 | |||
60 | + | 60 | + |
61 | +[Install] | 61 | +[Install] |
62 | +WantedBy=sysinit.target | 62 | +WantedBy=sysinit.target |
63 | diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in | 63 | Index: systemd-stable/units/systemd-binfmt.service.in |
64 | index e54e95e11d5d..372a598614d3 100644 | 64 | =================================================================== |
65 | --- a/units/systemd-binfmt.service.in | 65 | --- systemd-stable.orig/units/systemd-binfmt.service.in |
66 | +++ b/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 | 67 | @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc |
68 | Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems | 68 | Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems |
69 | DefaultDependencies=no | 69 | DefaultDependencies=no |
70 | Conflicts=shutdown.target | 70 | Conflicts=shutdown.target |