diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/binfmt-install.patch')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/binfmt-install.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/meta/recipes-core/systemd/systemd/binfmt-install.patch b/meta/recipes-core/systemd/systemd/binfmt-install.patch deleted file mode 100644 index 93b8e3cf3a..0000000000 --- a/meta/recipes-core/systemd/systemd/binfmt-install.patch +++ /dev/null | |||
| @@ -1,57 +0,0 @@ | |||
| 1 | Don't install dependency links at install time for the binfmt services, use | ||
| 2 | [Install] blocks so that they get created when the service is enabled like a | ||
| 3 | traditional service. | ||
| 4 | |||
| 5 | The [Install] blocks were rejected upstream as they don't have a way to "enable" | ||
| 6 | it on install without static symlinks which can't be disabled, only masked. We | ||
| 7 | however can do that in a postinst. | ||
| 8 | |||
| 9 | Upstream-Status: Denied | ||
| 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 11 | |||
| 12 | Index: git/Makefile.am | ||
| 13 | =================================================================== | ||
| 14 | --- git.orig/Makefile.am | ||
| 15 | +++ git/Makefile.am | ||
| 16 | @@ -4495,10 +4495,6 @@ | ||
| 17 | $(prefix)/lib/binfmt.d \ | ||
| 18 | $(sysconfdir)/binfmt.d | ||
| 19 | |||
| 20 | -SYSINIT_TARGET_WANTS += \ | ||
| 21 | - systemd-binfmt.service \ | ||
| 22 | - proc-sys-fs-binfmt_misc.automount | ||
| 23 | - | ||
| 24 | endif | ||
| 25 | |||
| 26 | EXTRA_DIST += \ | ||
| 27 | Index: git/units/proc-sys-fs-binfmt_misc.automount | ||
| 28 | =================================================================== | ||
| 29 | --- git.orig/units/proc-sys-fs-binfmt_misc.automount | ||
| 30 | +++ git/units/proc-sys-fs-binfmt_misc.automount | ||
| 31 | @@ -16,3 +16,6 @@ | ||
| 32 | |||
| 33 | [Automount] | ||
| 34 | Where=/proc/sys/fs/binfmt_misc | ||
| 35 | + | ||
| 36 | +[Install] | ||
| 37 | +WantedBy=sysinit.target | ||
| 38 | Index: git/units/systemd-binfmt.service.in | ||
| 39 | =================================================================== | ||
| 40 | --- git.orig/units/systemd-binfmt.service.in | ||
| 41 | +++ git/units/systemd-binfmt.service.in | ||
| 42 | @@ -11,6 +11,8 @@ | ||
| 43 | Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt | ||
| 44 | DefaultDependencies=no | ||
| 45 | Conflicts=shutdown.target | ||
| 46 | +Wants=proc-sys-fs-binfmt_misc.automount | ||
| 47 | + | ||
| 48 | After=proc-sys-fs-binfmt_misc.automount | ||
| 49 | Before=sysinit.target shutdown.target | ||
| 50 | ConditionPathIsReadWrite=/proc/sys/ | ||
| 51 | @@ -24,3 +26,6 @@ | ||
| 52 | Type=oneshot | ||
| 53 | RemainAfterExit=yes | ||
| 54 | ExecStart=@rootlibexecdir@/systemd-binfmt | ||
| 55 | + | ||
| 56 | +[Install] | ||
| 57 | +WantedBy=sysinit.target | ||