merged. Bruce
On Thu, May 24, 2018 at 3:02 PM, Mark Asselstine < [email protected]> wrote: > Upgrade and make the recipe more systemd "friendly". For the most part > nobody is going to use this with systemd but in case they do they will > get a masked and empty services file, as they do with Debian or > Ubuntu. Otherwise this is a minor update from v1.11. > > Signed-off-by: Mark Asselstine <[email protected]> > --- > .../{cgroup-lite_1.11.bb => cgroup-lite_1.15.bb} | 25 > ++++++++++++++++------ > 1 file changed, 18 insertions(+), 7 deletions(-) > rename recipes-containers/cgroup-lite/{cgroup-lite_1.11.bb => > cgroup-lite_1.15.bb} (54%) > > diff --git a/recipes-containers/cgroup-lite/cgroup-lite_1.11.bb > b/recipes-containers/cgroup-lite/cgroup-lite_1.15.bb > similarity index 54% > rename from recipes-containers/cgroup-lite/cgroup-lite_1.11.bb > rename to recipes-containers/cgroup-lite/cgroup-lite_1.15.bb > index 065d0ea..7b48c3a 100644 > --- a/recipes-containers/cgroup-lite/cgroup-lite_1.11.bb > +++ b/recipes-containers/cgroup-lite/cgroup-lite_1.15.bb > @@ -1,23 +1,34 @@ > SECTION = "devel" > SUMMARY = "Light-weight package to set up cgroups at system boot." > DESCRIPTION = "Light-weight package to set up cgroups at system boot." > -HOMEPAGE = "http://packages.ubuntu.com/source/precise/cgroup-lite"; > +HOMEPAGE = "http://packages.ubuntu.com/source/artful/cgroup-lite"; > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://debian/copyright;md5= > 5d5da4e0867cf06014f87102154d0102" > -SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/ > cgroup-lite_1.11.tar.xz" > +SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/ > cgroup-lite_1.15.tar.xz" > SRC_URI += "file://cgroups-init" > -SRC_URI[md5sum] = "b20976194ee8fdb61e6b55281fb6ead4" > -SRC_URI[sha256sum] = "a79ab9ae6fb3ff3ce0aa5539b055c0 > 379eaffdc6c5f003af4010fcea683c1a45" > +SRC_URI[md5sum] = "1438c1f4a7227c0dedfce5f86f02591d" > +SRC_URI[sha256sum] = "02f44c70ed3cf27b9e89e5266492fd > df4b455336ab4e03abc85e92297537201f" > > -inherit allarch > -inherit update-rc.d > +inherit allarch update-rc.d systemd > > INITSCRIPT_NAME = "cgroups-init" > INITSCRIPT_PARAMS = "start 8 2 3 4 5 . stop 20 0 1 6 ." > + > +# Keeps the sysvinit scripts out of the image if building > +# where systemd is in use. > +SYSTEMD_PACKAGES = "${PN}" > +SYSTEMD_SERVICE_${PN} = "cgroups-init.service" > +SYSTEMD_AUTO_ENABLE_${PN} = "mask" > + > + > do_install() { > install -d ${D}/bin > - install -d ${D}${sysconfdir}/init.d > install -m 0755 ${S}/scripts/cgroups-mount ${D}/bin > install -m 0755 ${S}/scripts/cgroups-umount ${D}/bin > + > + install -d ${D}${sysconfdir}/init.d > install -m 0755 ${WORKDIR}/cgroups-init ${D}${sysconfdir}/init.d/ > cgroups-init > + > + install -d ${D}${systemd_unitdir}/system > + ln -sf /dev/null ${D}${systemd_unitdir}/system/ > cgroups-init.service > } > -- > 2.7.4 > > -- > _______________________________________________ > meta-virtualization mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-virtualization > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
-- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
