diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2019-01-15 01:49:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-16 15:35:07 +0000 |
commit | f548c3f77bf1e7eda94cdb8af10ff64a0475ac6a (patch) | |
tree | 9eef5ff4446071e234a4da7be99a97ee2569297d | |
parent | f509a85ceab90ef6e248e687665b5d9a99d2b6b0 (diff) | |
download | poky-f548c3f77bf1e7eda94cdb8af10ff64a0475ac6a.tar.gz |
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)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd_239.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb index 87b0642c26..c146897508 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 | |||
337 | 337 | ||
338 | SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \ | 338 | SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \ |
339 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \ | 339 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \ |
340 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ | ||
340 | ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ | 341 | ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ |
341 | ${@bb.utils.contains('PACKAGECONFIG', '', '${PN}-journal-remote', '', d)} \ | ||
342 | " | 342 | " |
343 | SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" | 343 | SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" |
344 | 344 | ||