diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-05 17:18:01 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-09 23:30:15 +0100 |
commit | 038eb82ad62776dc3bf696f27b6a373c84934094 (patch) | |
tree | 81ea1f442599e8b735012682c1a0094e887e8684 /meta | |
parent | ec0e1d4fb985361bce79d29afd52d61397d79561 (diff) | |
download | poky-038eb82ad62776dc3bf696f27b6a373c84934094.tar.gz |
systemd: backport a patch to avoid unnecessary rsync dependency with latest meson
(From OE-Core rev: 3f0269ff1e5f87b23ef9012813a753daf3c5c24f)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch | 53 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd.inc | 4 |
2 files changed, 56 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch b/meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch new file mode 100644 index 0000000000..ae449791f1 --- /dev/null +++ b/meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> | ||
3 | Date: Mon, 12 Apr 2021 14:03:32 +0200 | ||
4 | Subject: [PATCH] meson: do not fail if rsync is not installed with meson | ||
5 | 0.57.2 | ||
6 | |||
7 | https://github.com/mesonbuild/meson/issues/8641 | ||
8 | |||
9 | Our CI started to fail. Even if the change is reverted in meson, | ||
10 | we need a quick workaround here. | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | --- | ||
15 | man/meson.build | 25 ++++++++++++++----------- | ||
16 | 1 file changed, 14 insertions(+), 11 deletions(-) | ||
17 | |||
18 | diff --git a/man/meson.build b/man/meson.build | ||
19 | index 3cae8446cda..f9c4b83dc81 100644 | ||
20 | --- a/man/meson.build | ||
21 | +++ b/man/meson.build | ||
22 | @@ -184,17 +184,20 @@ html = custom_target( | ||
23 | depends : html_pages, | ||
24 | command : ['echo']) | ||
25 | |||
26 | -run_target( | ||
27 | - 'doc-sync', | ||
28 | - depends : man_pages + html_pages, | ||
29 | - command : ['rsync', '-rlv', | ||
30 | - '--delete-excluded', | ||
31 | - '--include=man', | ||
32 | - '--include=*.html', | ||
33 | - '--exclude=*', | ||
34 | - '--omit-dir-times', | ||
35 | - meson.current_build_dir(), | ||
36 | - get_option('www-target')]) | ||
37 | +rsync = find_program('rsync', required : false) | ||
38 | +if rsync.found() | ||
39 | + run_target( | ||
40 | + 'doc-sync', | ||
41 | + depends : man_pages + html_pages, | ||
42 | + command : [rsync, '-rlv', | ||
43 | + '--delete-excluded', | ||
44 | + '--include=man', | ||
45 | + '--include=*.html', | ||
46 | + '--exclude=*', | ||
47 | + '--omit-dir-times', | ||
48 | + meson.current_build_dir(), | ||
49 | + get_option('www-target')]) | ||
50 | +endif | ||
51 | |||
52 | ############################################################ | ||
53 | |||
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 7d3b3064ba..3a919fd82b 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc | |||
@@ -16,6 +16,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ | |||
16 | 16 | ||
17 | SRCREV = "17472dca0160cbe7b807ca648475fd70d0d62fe5" | 17 | SRCREV = "17472dca0160cbe7b807ca648475fd70d0d62fe5" |
18 | SRCBRANCH = "v247-stable" | 18 | SRCBRANCH = "v247-stable" |
19 | SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" | 19 | SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ |
20 | file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ | ||
21 | " | ||
20 | 22 | ||
21 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |