summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Salveti <ricardo@opensourcefoundries.com>2018-02-02 03:02:23 -0200
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-02-05 20:27:32 -0500
commit545851a5df0accda6648d8d6a6fafe0cec422e99 (patch)
treecec07efd0bee1050cc1ae0ec82d5ffb86610136e
parent0cdb05a7d8e96c64aa0e2d7b3dd7eac81a241444 (diff)
downloadmeta-virtualization-545851a5df0accda6648d8d6a6fafe0cec422e99.tar.gz
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 <ricardo@opensourcefoundries.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-containers/lxc/lxc_2.0.8.bb2
1 files changed, 2 insertions, 0 deletions
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"
60CFLAGS_append = " -Wno-error=deprecated-declarations" 60CFLAGS_append = " -Wno-error=deprecated-declarations"
61 61
62PACKAGECONFIG ??= "templates \ 62PACKAGECONFIG ??= "templates \
63 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
63 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ 64 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
64" 65"
65PACKAGECONFIG[doc] = "--enable-doc --enable-api-docs,--disable-doc --disable-api-docs,," 66PACKAGECONFIG[doc] = "--enable-doc --enable-api-docs,--disable-doc --disable-api-docs,,"
@@ -68,6 +69,7 @@ PACKAGECONFIG[apparmour] = "--enable-apparmor,--disable-apparmor,apparmor,apparm
68PACKAGECONFIG[templates] = ",,, ${PN}-templates" 69PACKAGECONFIG[templates] = ",,, ${PN}-templates"
69PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" 70PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
70PACKAGECONFIG[seccomp] ="--enable-seccomp,--disable-seccomp,libseccomp,libseccomp" 71PACKAGECONFIG[seccomp] ="--enable-seccomp,--disable-seccomp,libseccomp,libseccomp"
72PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd,"
71PACKAGECONFIG[python] = "--enable-python,--disable-python,python3,python3-core" 73PACKAGECONFIG[python] = "--enable-python,--disable-python,python3,python3-core"
72PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua,lua" 74PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua,lua"
73 75