From 9ed1dd6329b393e4f780fb88fea98bc930138a57 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 11 Mar 2019 11:40:43 +0800 Subject: 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. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- ...clare-version.h-as-dependency-for-systemd.patch | 32 ++++++++++++++++++++++ meta/recipes-core/systemd/systemd_241.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dependency-for-systemd.patch (limited to 'meta/recipes-core') 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 @@ +From e14d724a932a255eec4d60b08e128519c33e88ee Mon Sep 17 00:00:00 2001 +From: Michael Olbrich +Date: Mon, 25 Feb 2019 11:59:23 +0100 +Subject: [PATCH] meson: declare version.h as dependency for systemd + +This is a followup to #11815 and adds the last missing dependency. +With this #11565 is hopefully really fixed. + +Upstream-Status: Backport + +Signed-off-by: Chen Qi +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 232f3e1..70148be 100644 +--- a/meson.build ++++ b/meson.build +@@ -1618,7 +1618,8 @@ executable('systemd', + include_directories : includes, + link_with : [libcore, + libshared], +- dependencies : [threads, ++ dependencies : [versiondep, ++ threads, + librt, + libseccomp, + libselinux, +-- +2.7.4 + 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 \ file://0004-rules-whitelist-hd-devices.patch \ file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ file://0001-meson-declare-version.h-as-dep-for-various-targets-t.patch \ + file://0001-meson-declare-version.h-as-dependency-for-systemd.patch \ " # patches needed by musl -- cgit 1.2.3-korg