From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Tue, 15 Jan 2019 00:49:06 +0000 (+0100)
Subject: systemd: Correct a conditional add to SYSTEMD_PACKAGES
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~15623
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42d52a279a75c94c4deba50b448dd3b6b2ac75df;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

systemd: Correct a conditional add to SYSTEMD_PACKAGES

The code conditionally adding ${PN}-journal-remote to SYSTEMD_PACKAGE
checked PACKAGECONFIG for an empty string rather than 'microhttpd'...

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb
index 87b0642c269..c1468975087 100644
--- a/meta/recipes-core/systemd/systemd_239.bb
+++ b/meta/recipes-core/systemd/systemd_239.bb
@@ -337,8 +337,8 @@ DESCRIPTION_${PN}-journal-remote = "systemd-journal-remote is a command to recei
 
 SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \
                     ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \
+                    ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \
                     ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \
-                    ${@bb.utils.contains('PACKAGECONFIG', '', '${PN}-journal-remote', '', d)} \
 "
 SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"