diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2019-03-11 11:40:43 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-12 11:57:41 -0700 |
commit | 1ee33bc13ffa7795678afdc369b2c9423d888f73 (patch) | |
tree | c5f2594aa790724e59b10d6fb75fad2165c1b9e5 /meta/recipes-core/systemd | |
parent | 7d9b03567d79c51bd47552a474e39d785a301b52 (diff) | |
download | poky-1ee33bc13ffa7795678afdc369b2c9423d888f73.tar.gz |
systemd: backport one more patch to fix version.h parallel build failure
We backported a patch to fix parallel build failure about version.h. But
that is not enough. We need one more patch to really fix this issue.
(From OE-Core rev: 9ed1dd6329b393e4f780fb88fea98bc930138a57)
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')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dependency-for-systemd.patch | 32 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_241.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dependency-for-systemd.patch b/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dependency-for-systemd.patch new file mode 100644 index 0000000000..8874dff9a5 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dependency-for-systemd.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From e14d724a932a255eec4d60b08e128519c33e88ee Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Olbrich <m.olbrich@pengutronix.de> | ||
3 | Date: Mon, 25 Feb 2019 11:59:23 +0100 | ||
4 | Subject: [PATCH] meson: declare version.h as dependency for systemd | ||
5 | |||
6 | This is a followup to #11815 and adds the last missing dependency. | ||
7 | With this #11565 is hopefully really fixed. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
12 | --- | ||
13 | meson.build | 3 ++- | ||
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/meson.build b/meson.build | ||
17 | index 232f3e1..70148be 100644 | ||
18 | --- a/meson.build | ||
19 | +++ b/meson.build | ||
20 | @@ -1618,7 +1618,8 @@ executable('systemd', | ||
21 | include_directories : includes, | ||
22 | link_with : [libcore, | ||
23 | libshared], | ||
24 | - dependencies : [threads, | ||
25 | + dependencies : [versiondep, | ||
26 | + threads, | ||
27 | librt, | ||
28 | libseccomp, | ||
29 | libselinux, | ||
30 | -- | ||
31 | 2.7.4 | ||
32 | |||
diff --git a/meta/recipes-core/systemd/systemd_241.bb b/meta/recipes-core/systemd/systemd_241.bb index 47492c9512..76668b741d 100644 --- a/meta/recipes-core/systemd/systemd_241.bb +++ b/meta/recipes-core/systemd/systemd_241.bb | |||
@@ -23,6 +23,7 @@ SRC_URI += "file://touchscreen.rules \ | |||
23 | file://0004-rules-whitelist-hd-devices.patch \ | 23 | file://0004-rules-whitelist-hd-devices.patch \ |
24 | file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ | 24 | file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ |
25 | file://0001-meson-declare-version.h-as-dep-for-various-targets-t.patch \ | 25 | file://0001-meson-declare-version.h-as-dep-for-various-targets-t.patch \ |
26 | file://0001-meson-declare-version.h-as-dependency-for-systemd.patch \ | ||
26 | " | 27 | " |
27 | 28 | ||
28 | # patches needed by musl | 29 | # patches needed by musl |