From 545851a5df0accda6648d8d6a6fafe0cec422e99 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Fri, 2 Feb 2018 03:02:23 -0200 Subject: lxc: set systemdsystemunitdir with systemd systemd unit dir can be customized by the distro (e.g. usrmerge), so make sure the correct unit dir path is set on configure. Signed-off-by: Ricardo Salveti Signed-off-by: Bruce Ashfield --- recipes-containers/lxc/lxc_2.0.8.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-containers/lxc/lxc_2.0.8.bb b/recipes-containers/lxc/lxc_2.0.8.bb index 651eb72e..d8607f84 100644 --- a/recipes-containers/lxc/lxc_2.0.8.bb +++ b/recipes-containers/lxc/lxc_2.0.8.bb @@ -60,6 +60,7 @@ EXTRA_OECONF += "--enable-log-src-basename" CFLAGS_append = " -Wno-error=deprecated-declarations" PACKAGECONFIG ??= "templates \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ " PACKAGECONFIG[doc] = "--enable-doc --enable-api-docs,--disable-doc --disable-api-docs,," @@ -68,6 +69,7 @@ PACKAGECONFIG[apparmour] = "--enable-apparmor,--disable-apparmor,apparmor,apparm PACKAGECONFIG[templates] = ",,, ${PN}-templates" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" PACKAGECONFIG[seccomp] ="--enable-seccomp,--disable-seccomp,libseccomp,libseccomp" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," PACKAGECONFIG[python] = "--enable-python,--disable-python,python3,python3-core" PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua,lua" -- cgit v1.2.3-54-g00ecf