summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-09-13 19:26:27 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-16 23:02:45 +0100
commit2e79c06beaa8605fcac6df65d902ee80c50e25c9 (patch)
treec917a431c342d5b5253b2273d295ab751a898673 /meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
parentd84e9f446a3e948f213182c3abfdaa168cc56c1f (diff)
downloadpoky-2e79c06beaa8605fcac6df65d902ee80c50e25c9.tar.gz
systemd: upgrade to 243
PATCH REBASED: ============== 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch 0001-do-not-disable-buffer-in-writing-files.patch 0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch 0004-add-fallback-parse_printf_format-implementation.patch 0004-rules-whitelist-hd-devices.patch 0005-rules-watch-metadata-changes-in-ide-devices.patch 0005-src-basic-missing.h-check-for-missing-strndupa.patch 0006-Include-netinet-if_ether.h.patch 0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch 0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch PATCH DROPPED: ============== 0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch 0001-src-udev-udev-event.c-must-include-sys-wait.h.patch 0023-socket-util.h-include-string.h.patch 0025-fs-utilh-add-missing-sys-stat-include.patch PATCH ADDED: ============ 0002-src-login-brightness.c-include-sys-wait.h.patch 0003-src-basic-copy.c-include-signal.h.patch 0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch Also applied libc-glibc over-ride to pkg_postinst and pkg_prerm function definitions, as musl does not provide nsswitch.conf. (From OE-Core rev: cd735ab1df78f7d21b6bb18bdf4707aec68a0295) Signed-off-by: Scott Murray <scott.murray@konsulko.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.patch23
1 files changed, 11 insertions, 12 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
index df5506cc2b..49a334d090 100644
--- 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
@@ -11,6 +11,8 @@ Upstream-Status: Inappropriate [OE-Specific]
11 11
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 13Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14[rebased for systemd 243]
15Signed-off-by: Scott Murray <scott.murray@konsulko.com>
14--- 16---
15 meson.build | 4 ---- 17 meson.build | 4 ----
16 tools/meson-make-symlink.sh | 3 ++- 18 tools/meson-make-symlink.sh | 3 ++-
@@ -18,10 +20,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
18 3 files changed, 8 insertions(+), 6 deletions(-) 20 3 files changed, 8 insertions(+), 6 deletions(-)
19 21
20diff --git a/meson.build b/meson.build 22diff --git a/meson.build b/meson.build
21index 56c98b9..3386546 100644 23index e5ceb1e169..79b762faeb 100644
22--- a/meson.build 24--- a/meson.build
23+++ b/meson.build 25+++ b/meson.build
24@@ -630,10 +630,6 @@ endforeach 26@@ -579,10 +579,6 @@ endforeach
25 27
26 conf.set_quoted('TELINIT', get_option('telinit-path')) 28 conf.set_quoted('TELINIT', get_option('telinit-path'))
27 29
@@ -33,23 +35,23 @@ index 56c98b9..3386546 100644
33 35
34 gperf = find_program('gperf') 36 gperf = find_program('gperf')
35diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh 37diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
36index 501cd43..f4e4ac9 100755 38index da0d13a341..90bc0a93c2 100755
37--- a/tools/meson-make-symlink.sh 39--- a/tools/meson-make-symlink.sh
38+++ b/tools/meson-make-symlink.sh 40+++ b/tools/meson-make-symlink.sh
39@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")" 41@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")"
40 if [ "$(dirname $1)" = . ]; then 42 if [ "$(dirname $1)" = . ]; then
41 ln -vfs -T "$1" "${DESTDIR:-}$2" 43 ln -vfs -T "$1" "${DESTDIR:-}$2"
42 else 44 else
43- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" 45- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
44+ rm -f "${DESTDIR:-}$2" 46+ rm -f "${DESTDIR:-}$2"
45+ lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2" 47+ lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2"
46 fi 48 fi
47diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh 49diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
48index e2b2603..210d604 100755 50index a483d75b86..3c01c523f1 100755
49--- a/units/meson-add-wants.sh 51--- a/units/meson-add-wants.sh
50+++ b/units/meson-add-wants.sh 52+++ b/units/meson-add-wants.sh
51@@ -25,4 +25,9 @@ case "$target" in 53@@ -25,4 +25,9 @@ case "$target" in
52 ;; 54 ;;
53 esac 55 esac
54 56
55-ln -vfs --relative "$unitpath" "$dir" 57-ln -vfs --relative "$unitpath" "$dir"
@@ -59,6 +61,3 @@ index e2b2603..210d604 100755
59+else 61+else
60+ lnr "$unitpath" "$dir" 62+ lnr "$unitpath" "$dir"
61+fi 63+fi
62--
632.7.4
64