summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2020-01-27 21:48:54 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-01-29 10:38:31 -0500
commit7c42107c713abff639bc536484714f5c25f57948 (patch)
treebddcbac4fb3fe5d2662d47a853a2f9dab1e8fb75
parent7f6f7a4fce37ab5ad505e1fb6ccb111b7bcee6b5 (diff)
downloadmeta-virtualization-7c42107c713abff639bc536484714f5c25f57948.tar.gz
conmon: compile with journald support if systemd is enabled
Currently conman is compiled without journald support which leads to this error message when trying to use it (e.g. --log-driver=journald with podman): [conmon:e] Include journald in compilation path to log to systemd journal Make sure to build with journald backend compiled-in when systemd is in distro features by adding systemd to DEPENDS (through PACKAGECONFIG). Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/conmon/conmon_2.0.9.bb3
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-containers/conmon/conmon_2.0.9.bb b/recipes-containers/conmon/conmon_2.0.9.bb
index fc76f15b..af7847b4 100644
--- a/recipes-containers/conmon/conmon_2.0.9.bb
+++ b/recipes-containers/conmon/conmon_2.0.9.bb
@@ -20,6 +20,9 @@ inherit pkgconfig
20 20
21EXTRA_OEMAKE = "PREFIX=${prefix} BINDIR=${bindir} LIBEXECDIR=${libexecdir}" 21EXTRA_OEMAKE = "PREFIX=${prefix} BINDIR=${bindir} LIBEXECDIR=${libexecdir}"
22 22
23PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
24PACKAGECONFIG[systemd] = ",,systemd"
25
23do_install() { 26do_install() {
24 oe_runmake 'DESTDIR=${D}' install 27 oe_runmake 'DESTDIR=${D}' install
25} 28}