]> code.ossystems Code Review - openembedded-core.git/commitdiff
systemd: Correct a conditional add to SYSTEMD_PACKAGES
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Tue, 15 Jan 2019 00:49:06 +0000 (01:49 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 15 Jan 2019 23:35:15 +0000 (23:35 +0000)
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>
meta/recipes-core/systemd/systemd_239.bb

index 87b0642c2699b2f2b44a376280c417696b1ad7ef..c1468975087b84ecd233917572910e8db73919b8 100644 (file)
@@ -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"