From 6454aba9dd909d7b337e9b5a74eb8d4d60122270 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 15 Jan 2019 01:49:06 +0100 Subject: 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'... (From OE-Core rev: 42d52a279a75c94c4deba50b448dd3b6b2ac75df) (From OE-Core rev: 86de2bff77054bb35b78aeaed8fcf95c6815779c) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_239.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb index aa05af3beb..832257992d 100644 --- a/meta/recipes-core/systemd/systemd_239.bb +++ b/meta/recipes-core/systemd/systemd_239.bb @@ -338,8 +338,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" -- cgit v1.2.3-54-g00ecf