From 11c7379fc5577002a05f536e43969f1d80e59bdc Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Mon, 28 May 2018 09:14:46 -0400 Subject: lxc: drop the -setup package For some packages we include a -setup package which can be installed as part of an image to complete a more comprehensive setup of the main package. This is common for example in meta-cloud-services since many OpenStack packages have extensive setup. The -setup package for lxc did at one point do comprehensive setup but over time this has been moved to the -networking package. Now the -setup package is only being used as a container for the systemd service files or sysvinit scripts. This can better be accomplished by setting appropriate runlevels for the initscripts or disabling or masking the systemd services (via SYSTEMD_AUTO_ENABLE). This also fixes some confusion or what might be considered a bug around -setup and -networking packages as the -setup package was mopping up the lxc-net.service file, instead of it being included in the -networking package. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- recipes-containers/lxc/lxc_2.0.8.bb | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) (limited to 'recipes-containers/lxc') diff --git a/recipes-containers/lxc/lxc_2.0.8.bb b/recipes-containers/lxc/lxc_2.0.8.bb index 4918d913..547c44f0 100644 --- a/recipes-containers/lxc/lxc_2.0.8.bb +++ b/recipes-containers/lxc/lxc_2.0.8.bb @@ -81,13 +81,17 @@ export STAGING_LIBDIR inherit autotools pkgconfig ptest update-rc.d systemd python3native -SYSTEMD_PACKAGES = "${PN}-setup" -SYSTEMD_SERVICE_${PN}-setup = "lxc.service" -SYSTEMD_AUTO_ENABLE_${PN}-setup = "disable" - -INITSCRIPT_PACKAGES = "${PN}-setup" -INITSCRIPT_NAME_{PN}-setup = "lxc" -INITSCRIPT_PARAMS_${PN}-setup = "defaults" +SYSTEMD_PACKAGES = "${PN} ${PN}-networking" +SYSTEMD_SERVICE_${PN} = "lxc.service" +SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_SERVICE_${PN}-networking = "lxc-net.service" +SYSTEMD_AUTO_ENABLE_${PN}-networking = "enable" + +INITSCRIPT_PACKAGES = "${PN} ${PN}-networking" +INITSCRIPT_NAME_${PN} = "lxc" +INITSCRIPT_PARAMS_${PN} = "defaults" +INITSCRIPT_NAME_${PN}-networking = "lxc-net" +INITSCRIPT_PARAMS_${PN}-networking = "defaults" FILES_${PN}-doc = "${mandir} ${infodir}" # For LXC the docdir only contains example configuration files and should be included in the lxc package @@ -96,18 +100,13 @@ FILES_${PN} += "${libdir}/python3*" FILES_${PN} += "${datadir}/bash-completion" FILES_${PN}-dbg += "${libexecdir}/lxc/.debug" FILES_${PN}-dbg += "${libexecdir}/lxc/hooks/.debug" -PACKAGES =+ "${PN}-templates ${PN}-setup ${PN}-networking ${PN}-lua" +PACKAGES =+ "${PN}-templates ${PN}-networking ${PN}-lua" FILES_lua-${PN} = "${datadir}/lua ${libdir}/lua" FILES_lua-${PN}-dbg += "${libdir}/lua/lxc/.debug" FILES_${PN}-templates += "${datadir}/lxc/templates" RDEPENDS_${PN}-templates += "bash" -ALLOW_EMPTY_${PN}-networking = "1" - -FILES_${PN}-setup += "/etc/tmpfiles.d" -FILES_${PN}-setup += "/lib/systemd/system" -FILES_${PN}-setup += "/usr/lib/systemd/system" -FILES_${PN}-setup += "/etc/init.d" +FILES_${PN}-networking += "${sysconfdir}/init.d/lxc-net" PRIVATE_LIBS_${PN}-ptest = "liblxc.so.1" @@ -128,10 +127,8 @@ do_install_append() { for i in `grep -l "#! */bin/bash" ${D}${datadir}/lxc/hooks/*`; do \ sed -e 's|#! */bin/bash|#!/bin/sh|' -i $i; done - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/init.d - install -m 755 config/init/sysvinit/lxc* ${D}${sysconfdir}/init.d - fi + install -d ${D}${sysconfdir}/init.d + install -m 755 config/init/sysvinit/lxc* ${D}${sysconfdir}/init.d # since python3-native is used for install location this will not be # suitable for the target and we will have to correct the package install -- cgit v1.2.3-54-g00ecf