summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-02-06 16:48:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:02 +0000
commit306820bad60c62a8096df8d1e4c7cc8e00dc38b7 (patch)
tree78fe9e9d90e19ca52f2cc462e1368e90484d4b4d /meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
parentcc7164836097a4100dce65e93b24a3a8874f65b3 (diff)
downloadpoky-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/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
deleted file mode 100644
index 49a334d090..0000000000
--- a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From bdbafe18c3bf99b3b691cd52b9ccff60f313892d Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 27 Jun 2018 16:09:24 +0800
4Subject: [PATCH 2/5] use lnr wrapper instead of looking for --relative option
5 for ln
6
7Remove file manually to avoid the 'File Exists' error when creating
8symlink. This is because the original 'ln' command uses '-f' option.
9
10Upstream-Status: Inappropriate [OE-Specific]
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14[rebased for systemd 243]
15Signed-off-by: Scott Murray <scott.murray@konsulko.com>
16---
17 meson.build | 4 ----
18 tools/meson-make-symlink.sh | 3 ++-
19 units/meson-add-wants.sh | 7 ++++++-
20 3 files changed, 8 insertions(+), 6 deletions(-)
21
22diff --git a/meson.build b/meson.build
23index e5ceb1e169..79b762faeb 100644
24--- a/meson.build
25+++ b/meson.build
26@@ -579,10 +579,6 @@ endforeach
27
28 conf.set_quoted('TELINIT', get_option('telinit-path'))
29
30-if run_command('ln', '--relative', '--help').returncode() != 0
31- error('ln does not support --relative (added in coreutils 8.16)')
32-endif
33-
34 ############################################################
35
36 gperf = find_program('gperf')
37diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
38index da0d13a341..90bc0a93c2 100755
39--- a/tools/meson-make-symlink.sh
40+++ b/tools/meson-make-symlink.sh
41@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")"
42 if [ "$(dirname $1)" = . ]; then
43 ln -vfs -T "$1" "${DESTDIR:-}$2"
44 else
45- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
46+ rm -f "${DESTDIR:-}$2"
47+ lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2"
48 fi
49diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
50index a483d75b86..3c01c523f1 100755
51--- a/units/meson-add-wants.sh
52+++ b/units/meson-add-wants.sh
53@@ -25,4 +25,9 @@ case "$target" in
54 ;;
55 esac
56
57-ln -vfs --relative "$unitpath" "$dir"
58+if [ -d "$dir" ]; then
59+ rm -f "$dir/$unit"
60+ lnr "$unitpath" "$dir/$unit"
61+else
62+ lnr "$unitpath" "$dir"
63+fi