diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-07-23 00:45:02 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-24 16:33:47 +0100 |
commit | a4c3deba6edc827291383b887b05cf68626470c2 (patch) | |
tree | 9a70f3f948d8fe2aaa9f996599b5d6bb3b48feaf /meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch | |
parent | be7193e5ffe0428005188514774f41146eb5bef8 (diff) | |
download | poky-a4c3deba6edc827291383b887b05cf68626470c2.tar.gz |
systemd: update 248.3 -> 249.1
jinja is now required:
https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704
Drop 0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch as it is a backport.
(From OE-Core rev: 323ec445dfe22860cd450c303db5ed8fcb4e791c)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 38 |
1 files changed, 19 insertions, 19 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 8dd22eeb7b..d3af734e06 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,4 +1,4 @@ | |||
1 | From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001 | 1 | From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Thu, 21 Feb 2019 16:23:24 +0800 | 3 | Date: Thu, 21 Feb 2019 16:23:24 +0800 |
4 | Subject: [PATCH] binfmt: Don't install dependency links at install time for | 4 | Subject: [PATCH] binfmt: Don't install dependency links at install time for |
@@ -25,11 +25,11 @@ 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 | Index: systemd-stable/units/meson.build | 28 | diff --git a/units/meson.build b/units/meson.build |
29 | =================================================================== | 29 | index 17e9ead9c1..e5502be620 100644 |
30 | --- systemd-stable.orig/units/meson.build | 30 | --- a/units/meson.build |
31 | +++ systemd-stable/units/meson.build | 31 | +++ b/units/meson.build |
32 | @@ -55,8 +55,7 @@ units = [ | 32 | @@ -59,8 +59,7 @@ units = [ |
33 | ['poweroff.target', '', | 33 | ['poweroff.target', '', |
34 | (with_runlevels ? 'runlevel0.target' : '')], | 34 | (with_runlevels ? 'runlevel0.target' : '')], |
35 | ['printer.target', ''], | 35 | ['printer.target', ''], |
@@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build | |||
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 | 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], | 41 | 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], |
42 | @@ -166,8 +165,7 @@ in_units = [ | 42 | @@ -178,8 +177,7 @@ in_units = [ |
43 | ['rc-local.service', 'HAVE_SYSV_COMPAT'], | ||
44 | ['rescue.service', ''], | 43 | ['rescue.service', ''], |
44 | ['serial-getty@.service', ''], | ||
45 | ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], | 45 | ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], |
46 | - ['systemd-binfmt.service', 'ENABLE_BINFMT', | 46 | - ['systemd-binfmt.service', 'ENABLE_BINFMT', |
47 | - 'sysinit.target.wants/'], | 47 | - 'sysinit.target.wants/'], |
@@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build | |||
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 | Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount | 52 | diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount |
53 | =================================================================== | 53 | index 172c8757ab..f65d8930c6 100644 |
54 | --- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount | 54 | --- a/units/proc-sys-fs-binfmt_misc.automount |
55 | +++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount | 55 | +++ b/units/proc-sys-fs-binfmt_misc.automount |
56 | @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ | 56 | @@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/ |
57 | 57 | ||
58 | [Automount] | 58 | [Automount] |
59 | Where=/proc/sys/fs/binfmt_misc | 59 | Where=/proc/sys/fs/binfmt_misc |
60 | + | 60 | + |
61 | +[Install] | 61 | +[Install] |
62 | +WantedBy=sysinit.target | 62 | +WantedBy=sysinit.target |
63 | Index: systemd-stable/units/systemd-binfmt.service.in | 63 | diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in |
64 | =================================================================== | 64 | index fdafce7ff7..4efc05e495 100644 |
65 | --- systemd-stable.orig/units/systemd-binfmt.service.in | 65 | --- a/units/systemd-binfmt.service.in |
66 | +++ systemd-stable/units/systemd-binfmt.service.in | 66 | +++ b/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/html/latest/admin-guide/binfmt-misc.htm |
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 |
@@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in | |||
73 | After=proc-sys-fs-binfmt_misc.mount | 73 | After=proc-sys-fs-binfmt_misc.mount |
74 | Before=sysinit.target shutdown.target | 74 | Before=sysinit.target shutdown.target |
75 | @@ -30,3 +31,6 @@ RemainAfterExit=yes | 75 | @@ -30,3 +31,6 @@ RemainAfterExit=yes |
76 | ExecStart=@rootlibexecdir@/systemd-binfmt | 76 | ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt |
77 | ExecStop=@rootlibexecdir@/systemd-binfmt --unregister | 77 | ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister |
78 | TimeoutSec=90s | 78 | TimeoutSec=90s |
79 | + | 79 | + |
80 | +[Install] | 80 | +[Install] |