diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-03-12 14:35:45 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-20 09:59:33 +0000 |
commit | 40db00818e3b1cce8aa85ee30f3081ae9a5f8e66 (patch) | |
tree | db55cb6251e3e268cf29764fe71aae4e27517b3a /meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch | |
parent | 0748f2c4d5c773d1cefa80df97c126194c86b78e (diff) | |
download | poky-40db00818e3b1cce8aa85ee30f3081ae9a5f8e66.tar.gz |
systemd: upgrade to 237
Upgrade systemd to 237.
Note that this version has dropped autotools support.
The following patches are rebased:
0004-Use-getenv-when-secure-versions-are-not-available.patch
0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
0018-check-for-uchar.h-in-configure.patch
0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
0001-add-fallback-parse_printf_format-implementation.patch
0002-src-basic-missing.h-check-for-missing-strndupa.patch
0007-check-for-missing-canonicalize_file_name.patch
0008-Do-not-enable-nss-tests.patch
0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
The following backported patches are dropped:
0001-core-evaluate-presets-after-generators-have-run-6526.patch
0001-main-skip-many-initialization-steps-when-running-in-.patch
0001-meson-update-header-file-to-detect-memfd_create.patch
0003-fileio-include-sys-mman.h.patch
The following patch is dropped as autotools support is dropped:
0002-configure.ac-Check-if-memfd_create-is-already-define.patch
The following patches are newly added to fix problems:
0027-remove-nobody-user-group-checking.patch
0028-add-missing-FTW_-macros-for-musl.patch
0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch
0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
Other changes are mostly autotools/meson related.
This new version has dropped ptest support, as there's no easy
way to do this in the framework of meson.
(From OE-Core rev: 906230a73b3ccfa4afd2a19a6b0aa18cd1d5fa08)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch new file mode 100644 index 0000000000..28f1b217e0 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From 8b9d194e956848e0d1fb35ef2fba714b2691ebe6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Wed, 28 Feb 2018 20:47:49 -0800 | ||
4 | Subject: [PATCH 03/31] use lnr wrapper instead of looking for --relative | ||
5 | option 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 | --- | ||
15 | meson.build | 4 ---- | ||
16 | tools/meson-make-symlink.sh | 3 ++- | ||
17 | units/meson-add-wants.sh | 7 ++++++- | ||
18 | 3 files changed, 8 insertions(+), 6 deletions(-) | ||
19 | |||
20 | diff --git a/meson.build b/meson.build | ||
21 | index 36a62d280..7347ea880 100644 | ||
22 | --- a/meson.build | ||
23 | +++ b/meson.build | ||
24 | @@ -570,10 +570,6 @@ endforeach | ||
25 | |||
26 | conf.set_quoted('TELINIT', get_option('telinit-path')) | ||
27 | |||
28 | -if run_command('ln', '--relative', '--help').returncode() != 0 | ||
29 | - error('ln does not support --relative') | ||
30 | -endif | ||
31 | - | ||
32 | ############################################################ | ||
33 | |||
34 | gperf = find_program('gperf') | ||
35 | diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh | ||
36 | index 501cd43d4..f4e4ac9ac 100755 | ||
37 | --- a/tools/meson-make-symlink.sh | ||
38 | +++ b/tools/meson-make-symlink.sh | ||
39 | @@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")" | ||
40 | if [ "$(dirname $1)" = . ]; then | ||
41 | ln -vfs -T "$1" "${DESTDIR:-}$2" | ||
42 | else | ||
43 | - ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" | ||
44 | + rm -f "${DESTDIR:-}$2" | ||
45 | + lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2" | ||
46 | fi | ||
47 | diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh | ||
48 | index 70f7172ae..a42666aac 100755 | ||
49 | --- a/units/meson-add-wants.sh | ||
50 | +++ b/units/meson-add-wants.sh | ||
51 | @@ -25,4 +25,9 @@ case "$target" in | ||
52 | ;; | ||
53 | esac | ||
54 | |||
55 | -ln -vfs --relative "$unitpath" "$dir" | ||
56 | +if [ -d "$dir" ]; then | ||
57 | + rm -f "$dir/$unit" | ||
58 | + lnr "$unitpath" "$dir/$unit" | ||
59 | +else | ||
60 | + lnr "$unitpath" "$dir" | ||
61 | +fi | ||
62 | -- | ||
63 | 2.13.0 | ||
64 | |||