summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dependency-for-systemd.patch32
-rw-r--r--meta/recipes-core/systemd/systemd_241.bb1
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 @@
1From e14d724a932a255eec4d60b08e128519c33e88ee Mon Sep 17 00:00:00 2001
2From: Michael Olbrich <m.olbrich@pengutronix.de>
3Date: Mon, 25 Feb 2019 11:59:23 +0100
4Subject: [PATCH] meson: declare version.h as dependency for systemd
5
6This is a followup to #11815 and adds the last missing dependency.
7With this #11565 is hopefully really fixed.
8
9Upstream-Status: Backport
10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12---
13 meson.build | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/meson.build b/meson.build
17index 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--
312.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