Please ignore this one, I will resend. //Chong
On 09/03/2014 02:23 PM, Chong Lu wrote:
Split a ${PN}-template pkg to put ${datadir}/lxc/templates/, and debash in ${datadir}/lxc/hooks/* Bash scripts: lxc/usr/share/lxc/hooks/mountcgroups:#!/bin/bash lxc/usr/share/lxc/hooks/ubuntu-cloud-prep:#!/bin/bash lxc/usr/share/lxc/templates/lxc-debian:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-openmandriva:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-archlinux:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-centos:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-plamo:1:#!/bin/bash -eu lxc/usr/share/lxc/templates/lxc-ubuntu-cloud:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-opensuse:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-gentoo:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-altlinux:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-sshd:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-ubuntu:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-cirros:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-busybox:1:#!/bin/bash lxc/usr/share/lxc/templates/lxc-fedora:1:#!/bin/bash Signed-off-by: Chong Lu <[email protected]> --- recipes-containers/lxc/lxc_1.0.5.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/recipes-containers/lxc/lxc_1.0.5.bb b/recipes-containers/lxc/lxc_1.0.5.bb index bea1ad0..7c83bc7 100644 --- a/recipes-containers/lxc/lxc_1.0.5.bb +++ b/recipes-containers/lxc/lxc_1.0.5.bb @@ -37,10 +37,11 @@ S = "${WORKDIR}/${BPN}-${PV}" PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-tests', '', d)}" EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}"-PACKAGECONFIG ??= ""+PACKAGECONFIG ??= "templates" PACKAGECONFIG[doc] = "--enable-doc,--disable-doc,," PACKAGECONFIG[rpath] = "--enable-rpath,--disable-rpath,," PACKAGECONFIG[apparmour] = "--enable-apparmor,--disable-apparmor,apparmor,apparmor" +PACKAGECONFIG[templates] = ",,, ${PN}-templates"inherit autotools pkgconfig ptest @@ -48,6 +49,9 @@ 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" @@ -57,8 +61,9 @@ do_install_append() {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 - + > ${D}${sysconfdir}/default/volatiles/99_lxc + for i in `grep -l "bash" ${D}${datadir}/lxc/hooks/*`; do \ + sed -e 's|bash|sh|' -i $i; done }EXTRA_OEMAKE += "TEST_DIR=${D}${PTEST_PATH}/src/tests"
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
