From 246fc0bfafa457b039ad3001cb47e02eb8523b24 Mon Sep 17 00:00:00 2001 From: Bogdan Purcareata Date: Thu, 2 Oct 2014 19:01:17 -0400 Subject: lxc: Update version to 1.0.6 Also remove patch file that no longer applies. Signed-off-by: Bogdan Purcareata Signed-off-by: Bruce Ashfield --- ...tomake-ensure-VPATH-builds-work-correctly.patch | 45 ------------ recipes-containers/lxc/lxc_1.0.5.bb | 80 ---------------------- recipes-containers/lxc/lxc_1.0.6.bb | 79 +++++++++++++++++++++ 3 files changed, 79 insertions(+), 125 deletions(-) delete mode 100644 recipes-containers/lxc/files/automake-ensure-VPATH-builds-work-correctly.patch delete mode 100644 recipes-containers/lxc/lxc_1.0.5.bb create mode 100644 recipes-containers/lxc/lxc_1.0.6.bb diff --git a/recipes-containers/lxc/files/automake-ensure-VPATH-builds-work-correctly.patch b/recipes-containers/lxc/files/automake-ensure-VPATH-builds-work-correctly.patch deleted file mode 100644 index 2a919513..00000000 --- a/recipes-containers/lxc/files/automake-ensure-VPATH-builds-work-correctly.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 08ccd79319e66b3f0b51fd5f5b539e652a16dfc0 Mon Sep 17 00:00:00 2001 -From: Mark Asselstine -Date: Wed, 30 Apr 2014 11:06:12 -0400 -Subject: [PATCH] automake: ensure VPATH builds work correctly - -There were a few non-VPATH friendly directives in some Makefile.am files, fix -these up to allow VPATH builds to work. - -Signed-off-by: Mark Asselstine ---- - config/etc/Makefile.am | 4 ++-- - src/tests/Makefile.am | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config/etc/Makefile.am b/config/etc/Makefile.am -index 81d7709..dca001e 100644 ---- a/config/etc/Makefile.am -+++ b/config/etc/Makefile.am -@@ -4,8 +4,8 @@ distroconf = @LXC_DISTRO_CONF@ - - EXTRA_DIST = default.conf.ubuntu default.conf.libvirt default.conf.unknown - --default.conf: -- cp $(distroconf) $@ -+default.conf: $(distroconf) -+ cp $? $@ - - clean-local: - @$(RM) -f default.conf -diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am -index 7f6645b..641e207 100644 ---- a/src/tests/Makefile.am -+++ b/src/tests/Makefile.am -@@ -64,7 +64,7 @@ buildtest-TESTS: $(TESTS) - install-ptest: - install -d $(TEST_DIR) - install -D ../lxc/liblxc.so $(TEST_DIR)/../lxc/liblxc.so -- install -D ../../config/test-driver $(TEST_DIR)/../../config/test-driver -+ install -D $(top_srcdir)/config/test-driver $(TEST_DIR)/../../config/test-driver - cp Makefile $(TEST_DIR) - @(for file in $(TESTS); do install $$file $(TEST_DIR); done;) - sed -i 's|^Makefile:|_Makefile:|' $(TEST_DIR)/Makefile --- -1.8.3.2 - diff --git a/recipes-containers/lxc/lxc_1.0.5.bb b/recipes-containers/lxc/lxc_1.0.5.bb deleted file mode 100644 index 232a3d07..00000000 --- a/recipes-containers/lxc/lxc_1.0.5.bb +++ /dev/null @@ -1,80 +0,0 @@ -DESCRIPTION = "lxc aims to use these new functionnalities to provide an userspace container object" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -PRIORITY = "optional" -DEPENDS = "libxml2 libcap" -RDEPENDS_${PN} = " \ - rsync \ - gzip \ - libcap-bin \ - bridge-utils \ - dnsmasq \ - perl-module-strict \ - perl-module-getopt-long \ - perl-module-vars \ - perl-module-warnings-register \ - perl-module-exporter \ - perl-module-constant \ - perl-module-overload \ - perl-module-exporter-heavy \ -" -RDEPENDS_${PN}-ptest += "file make" - -SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \ - file://lxc-1.0.0-disable-udhcp-from-busybox-template.patch \ - file://runtest.patch \ - file://run-ptest \ - file://automake-ensure-VPATH-builds-work-correctly.patch \ - " -SRC_URI[md5sum] = "9d9af9e9e69a831cd50b58d91c786013" -SRC_URI[sha256sum] = "02ac82e69a76d424e5443b9c577e84a8eaafcebf17cfd865eedee147e8ef8844" - -S = "${WORKDIR}/${BPN}-${PV}" - -# Let's not configure for the host distro. -# -PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-tests', '', d)}" -EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}" - -PACKAGECONFIG ??= "templates" -PACKAGECONFIG[doc] = "--enable-doc --enable-api-docs,--disable-doc --disable-api-docs,," -PACKAGECONFIG[rpath] = "--enable-rpath,--disable-rpath,," -PACKAGECONFIG[apparmour] = "--enable-apparmor,--disable-apparmor,apparmor,apparmor" -PACKAGECONFIG[templates] = ",,, ${PN}-templates" - -inherit autotools pkgconfig ptest - -FILES_${PN}-doc = "${mandir} ${infodir}" -# For LXC the docdir only contains example configuration files and should be included in the lxc package -FILES_${PN} += "${docdir}" -FILES_${PN}-dbg += "${libexecdir}/lxc/.debug" -PACKAGES =+ "${PN}-templates" -FILES_${PN}-templates += "${datadir}/lxc/templates" -RDEPENDS_${PN}-templates += "bash" - -PRIVATE_LIBS_${PN}-ptest = "liblxc.so.1" - -do_install_append() { - # The /var/cache/lxc directory created by the Makefile - # is wiped out in volatile, we need to create this at boot. - rm -rf ${D}${localstatedir}/cache - install -d ${D}${sysconfdir}/default/volatiles - echo "d root root 0755 ${localstatedir}/cache/lxc none" \ - > ${D}${sysconfdir}/default/volatiles/99_lxc - - for i in `grep -l "#! */bin/bash" ${D}${datadir}/lxc/hooks/*`; do \ - sed -e 's|#! */bin/bash|#!/bin/sh|' -i $i; done -} - -EXTRA_OEMAKE += "TEST_DIR=${D}${PTEST_PATH}/src/tests" - -do_install_ptest() { - oe_runmake -C src/tests install-ptest -} - -pkg_postinst_${PN}() { - if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then - /etc/init.d/populate-volatile.sh update - fi -} diff --git a/recipes-containers/lxc/lxc_1.0.6.bb b/recipes-containers/lxc/lxc_1.0.6.bb new file mode 100644 index 00000000..5b1eb0aa --- /dev/null +++ b/recipes-containers/lxc/lxc_1.0.6.bb @@ -0,0 +1,79 @@ +DESCRIPTION = "lxc aims to use these new functionnalities to provide an userspace container object" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +PRIORITY = "optional" +DEPENDS = "libxml2 libcap" +RDEPENDS_${PN} = " \ + rsync \ + gzip \ + libcap-bin \ + bridge-utils \ + dnsmasq \ + perl-module-strict \ + perl-module-getopt-long \ + perl-module-vars \ + perl-module-warnings-register \ + perl-module-exporter \ + perl-module-constant \ + perl-module-overload \ + perl-module-exporter-heavy \ +" +RDEPENDS_${PN}-ptest += "file make" + +SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \ + file://lxc-1.0.0-disable-udhcp-from-busybox-template.patch \ + file://runtest.patch \ + file://run-ptest \ + " +SRC_URI[md5sum] = "4aad3aee84b42faa194e44091d723a3b" +SRC_URI[sha256sum] = "fc6bffa750f00daaa92aa33d719c1cc235146aa779ebd2a64a0c24423977cf14" + +S = "${WORKDIR}/${BPN}-${PV}" + +# Let's not configure for the host distro. +# +PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-tests', '', d)}" +EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}" + +PACKAGECONFIG ??= "templates" +PACKAGECONFIG[doc] = "--enable-doc --enable-api-docs,--disable-doc --disable-api-docs,," +PACKAGECONFIG[rpath] = "--enable-rpath,--disable-rpath,," +PACKAGECONFIG[apparmour] = "--enable-apparmor,--disable-apparmor,apparmor,apparmor" +PACKAGECONFIG[templates] = ",,, ${PN}-templates" + +inherit autotools pkgconfig ptest + +FILES_${PN}-doc = "${mandir} ${infodir}" +# For LXC the docdir only contains example configuration files and should be included in the lxc package +FILES_${PN} += "${docdir}" +FILES_${PN}-dbg += "${libexecdir}/lxc/.debug" +PACKAGES =+ "${PN}-templates" +FILES_${PN}-templates += "${datadir}/lxc/templates" +RDEPENDS_${PN}-templates += "bash" + +PRIVATE_LIBS_${PN}-ptest = "liblxc.so.1" + +do_install_append() { + # The /var/cache/lxc directory created by the Makefile + # is wiped out in volatile, we need to create this at boot. + rm -rf ${D}${localstatedir}/cache + install -d ${D}${sysconfdir}/default/volatiles + echo "d root root 0755 ${localstatedir}/cache/lxc none" \ + > ${D}${sysconfdir}/default/volatiles/99_lxc + + for i in `grep -l "#! */bin/bash" ${D}${datadir}/lxc/hooks/*`; do \ + sed -e 's|#! */bin/bash|#!/bin/sh|' -i $i; done +} + +EXTRA_OEMAKE += "TEST_DIR=${D}${PTEST_PATH}/src/tests" + +do_install_ptest() { + oe_runmake -C src/tests install-ptest +} + +pkg_postinst_${PN}() { + if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then + /etc/init.d/populate-volatile.sh update + fi +} -- cgit v1.2.3-54-g00ecf