diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2020-02-06 16:48:13 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-08 13:20:02 +0000 |
commit | 306820bad60c62a8096df8d1e4c7cc8e00dc38b7 (patch) | |
tree | 78fe9e9d90e19ca52f2cc462e1368e90484d4b4d /meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch | |
parent | cc7164836097a4100dce65e93b24a3a8874f65b3 (diff) | |
download | poky-306820bad60c62a8096df8d1e4c7cc8e00dc38b7.tar.gz |
systemd: upgrade 243.4 -> 244.1
Drop 0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch a
variant on which was introduced in 2c1047310970 ("Upgrade to systemd
211+") in 2014. The oldest supported build machine is now CentOS 7 which
has --relative support in ln, so there no longer appears to be any need
for this change.
Rebase/refresh musl patches:
- replace missing.h with specific missing_... header
- fix additional WRITE_STRING_FILE_DISABLE_BUFFER
- fix more places that need netinet/if_ether.h
(From OE-Core rev: 44a4ac2294da0f53cbbfabc7ece836fe97f4d3f7)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.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 | 33 |
1 files changed, 17 insertions, 16 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 ea37680221..6eaaec71c5 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,8 +1,8 @@ | |||
1 | From 98254e4798e79d52ac6b562616cd244120f6e239 Mon Sep 17 00:00:00 2001 | 1 | From c73a87871df31b4f8d96c9d443759c6f702935f6 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 1/5] binfmt: Don't install dependency links at install time | 4 | Subject: [PATCH] binfmt: Don't install dependency links at install time for |
5 | for the binfmt services | 5 | the binfmt services |
6 | 6 | ||
7 | use [Install] blocks so that they get created when the service is enabled | 7 | use [Install] blocks so that they get created when the service is enabled |
8 | like a traditional service. | 8 | like a traditional service. |
@@ -18,16 +18,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
18 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 18 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
19 | [rebased for systemd 243] | 19 | [rebased for systemd 243] |
20 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 20 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
21 | |||
21 | --- | 22 | --- |
22 | units/meson.build | 6 ++---- | 23 | units/meson.build | 6 ++---- |
23 | units/proc-sys-fs-binfmt_misc.automount | 3 +++ | 24 | units/proc-sys-fs-binfmt_misc.automount | 3 +++ |
24 | units/systemd-binfmt.service.in | 4 ++++ | 25 | units/systemd-binfmt.service.in | 4 ++++ |
25 | 3 files changed, 9 insertions(+), 4 deletions(-) | 26 | 3 files changed, 9 insertions(+), 4 deletions(-) |
26 | 27 | ||
27 | Index: systemd-stable/units/meson.build | 28 | diff --git a/units/meson.build b/units/meson.build |
28 | =================================================================== | 29 | index 6a3a0d0dea22..bbb1b78618c3 100644 |
29 | --- systemd-stable.orig/units/meson.build | 30 | --- a/units/meson.build |
30 | +++ systemd-stable/units/meson.build | 31 | +++ b/units/meson.build |
31 | @@ -46,8 +46,7 @@ units = [ | 32 | @@ -46,8 +46,7 @@ units = [ |
32 | ['poweroff.target', '', | 33 | ['poweroff.target', '', |
33 | 'runlevel0.target'], | 34 | 'runlevel0.target'], |
@@ -48,10 +49,10 @@ Index: systemd-stable/units/meson.build | |||
48 | ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], | 49 | ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], |
49 | ['systemd-boot-check-no-failures.service', ''], | 50 | ['systemd-boot-check-no-failures.service', ''], |
50 | ['systemd-boot-system-token.service', 'ENABLE_EFI', | 51 | ['systemd-boot-system-token.service', 'ENABLE_EFI', |
51 | 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 |
52 | =================================================================== | 53 | index 30a6bc991844..4231f3b70fe9 100644 |
53 | --- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount | 54 | --- a/units/proc-sys-fs-binfmt_misc.automount |
54 | +++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount | 55 | +++ b/units/proc-sys-fs-binfmt_misc.automount |
55 | @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ | 56 | @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ |
56 | 57 | ||
57 | [Automount] | 58 | [Automount] |
@@ -59,11 +60,11 @@ Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount | |||
59 | + | 60 | + |
60 | +[Install] | 61 | +[Install] |
61 | +WantedBy=sysinit.target | 62 | +WantedBy=sysinit.target |
62 | Index: systemd-stable/units/systemd-binfmt.service.in | 63 | diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in |
63 | =================================================================== | 64 | index 0c0f26451b67..763c4c466c16 100644 |
64 | --- systemd-stable.orig/units/systemd-binfmt.service.in | 65 | --- a/units/systemd-binfmt.service.in |
65 | +++ systemd-stable/units/systemd-binfmt.service.in | 66 | +++ b/units/systemd-binfmt.service.in |
66 | @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc | 67 | @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm |
67 | Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems | 68 | Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems |
68 | DefaultDependencies=no | 69 | DefaultDependencies=no |
69 | Conflicts=shutdown.target | 70 | Conflicts=shutdown.target |