diff options
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.patch | 63 |
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 @@ | |||
1 | From bdbafe18c3bf99b3b691cd52b9ccff60f313892d Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Wed, 27 Jun 2018 16:09:24 +0800 | ||
4 | Subject: [PATCH 2/5] use lnr wrapper instead of looking for --relative option | ||
5 | for ln | ||
6 | |||
7 | Remove file manually to avoid the 'File Exists' error when creating | ||
8 | symlink. This is because the original 'ln' command uses '-f' option. | ||
9 | |||
10 | Upstream-Status: Inappropriate [OE-Specific] | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
14 | [rebased for systemd 243] | ||
15 | Signed-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 | |||
22 | diff --git a/meson.build b/meson.build | ||
23 | index 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') | ||
37 | diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh | ||
38 | index 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 | ||
49 | diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh | ||
50 | index 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 | ||