summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-12-14 05:55:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-16 12:12:18 +0000
commit54f01ca1174179918828a9b61ebc6c3e62da8e88 (patch)
tree6f2c6c34b6716962bd12a19cf4c2796f9f17976c /meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
parent63bdadccb662fcae52ec9ddb7f6e43b454dd1d1c (diff)
downloadpoky-54f01ca1174179918828a9b61ebc6c3e62da8e88.tar.gz
systemd: Upgrade to 228
Forward port all patches and format them to be git am'able Drop patches specific to uclibc's missing features which now are there in uclibc-ng (From OE-Core rev: fcaa030fa3c6eb0980cc635b92d6819682cf7742) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch71
1 files changed, 0 insertions, 71 deletions
diff --git a/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
deleted file mode 100644
index 0e20fd0548..0000000000
--- a/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From 184a89caacfa00f07e7275bca592bd7dda1b541e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 05:03:44 +0000
4Subject: [PATCH 03/11] binfmt: Don't install dependency links at install time
5 for 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"
12it on install without static symlinks which can't be disabled, only
13masked. We
14however can do that in a postinst.
15
16Upstream-Status: Denied
17
18Signed-off-by: Ross Burton <ross.burton@intel.com>
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 Makefile.am | 4 ----
22 units/proc-sys-fs-binfmt_misc.automount | 3 +++
23 units/systemd-binfmt.service.in | 5 +++++
24 3 files changed, 8 insertions(+), 4 deletions(-)
25
26Index: git/Makefile.am
27===================================================================
28--- git.orig/Makefile.am
29+++ git/Makefile.am
30@@ -4271,10 +4271,6 @@ INSTALL_DIRS += \
31 $(prefix)/lib/binfmt.d \
32 $(sysconfdir)/binfmt.d
33
34-SYSINIT_TARGET_WANTS += \
35- systemd-binfmt.service \
36- proc-sys-fs-binfmt_misc.automount
37-
38 endif
39
40 EXTRA_DIST += \
41Index: git/units/proc-sys-fs-binfmt_misc.automount
42===================================================================
43--- git.orig/units/proc-sys-fs-binfmt_misc.automount
44+++ git/units/proc-sys-fs-binfmt_misc.automount
45@@ -16,3 +16,6 @@ ConditionPathIsReadWrite=/proc/sys/
46
47 [Automount]
48 Where=/proc/sys/fs/binfmt_misc
49+
50+[Install]
51+WantedBy=sysinit.target
52Index: git/units/systemd-binfmt.service.in
53===================================================================
54--- git.orig/units/systemd-binfmt.service.in
55+++ git/units/systemd-binfmt.service.in
56@@ -11,6 +11,8 @@ Documentation=man:systemd-binfmt.service
57 Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
58 DefaultDependencies=no
59 Conflicts=shutdown.target
60+Wants=proc-sys-fs-binfmt_misc.automount
61+
62 After=proc-sys-fs-binfmt_misc.automount
63 Before=sysinit.target shutdown.target
64 ConditionPathIsReadWrite=/proc/sys/
65@@ -25,3 +27,6 @@ Type=oneshot
66 RemainAfterExit=yes
67 ExecStart=@rootlibexecdir@/systemd-binfmt
68 TimeoutSec=90s
69+
70+[Install]
71+WantedBy=sysinit.target