[PATCH 1/3] libvirt: correct libcap-ng options

[PATCH 1/3] libvirt: correct libcap-ng options

[Dmitry Eremin-Solenikov]

Fix the following warning by passing correct option to configure script:

WARNING: QA Issue: libvirt: configure was passed unrecognised options:
--with-capnp [unknown-configure-option]

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
 recipes-extended/libvirt/libvirt_1.2.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/libvirt/libvirt_1.2.12.bb b/recipes-extended/libvirt/libvirt_1.2.12.bb
index dca2d1b..2e0dfea 100644
--- a/recipes-extended/libvirt/libvirt_1.2.12.bb
+++ b/recipes-extended/libvirt/libvirt_1.2.12.bb
@@ -188,7 +188,7 @@ PACKAGECONFIG[iproute2] = "ac_cv_path_IP_PATH=/sbin/ip,ac_cv_path_IP_PATH=,iprou
 PACKAGECONFIG[numactl] = "--with-numactl,--without-numactl,numactl,"
 PACKAGECONFIG[fuse] = "--with-fuse,--without-fuse,fuse,"
 PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit,"
-PACKAGECONFIG[libcap-ng] = "--with-capnp,--without-capng,libcap-ng,"
+PACKAGECONFIG[libcap-ng] = "--with-capng,--without-capng,libcap-ng,"
 
 # Enable the Python tool support
 require libvirt-python.inc
-- 
2.1.4

[PATCH 2/3] lxc: include systemd files into lxc-setup

[Dmitry Eremin-Solenikov]

lxc-setup package accumulates all initscripts, so it should also include
systemd service files.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
 recipes-containers/lxc/lxc_1.0.7.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-containers/lxc/lxc_1.0.7.bb b/recipes-containers/lxc/lxc_1.0.7.bb
index c9eef75..1c70958 100644
--- a/recipes-containers/lxc/lxc_1.0.7.bb
+++ b/recipes-containers/lxc/lxc_1.0.7.bb
@@ -72,6 +72,7 @@ RDEPENDS_${PN}-templates += "bash"
 
 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"
 
 PRIVATE_LIBS_${PN}-ptest = "liblxc.so.1"
-- 
2.1.4

[PATCH 3/3] lxc: fix building when B != S

[Dmitry Eremin-Solenikov]

If lxc is built not in the source dir, upstart files will fail to be
installed, because of Makefile error.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
 recipes-containers/lxc/files/lxc-fix-B-S.patch | 17 +++++++++++++++++
 recipes-containers/lxc/lxc_1.0.7.bb            |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 recipes-containers/lxc/files/lxc-fix-B-S.patch

diff --git a/recipes-containers/lxc/files/lxc-fix-B-S.patch b/recipes-containers/lxc/files/lxc-fix-B-S.patch
new file mode 100644
index 0000000..3822655
--- /dev/null
+++ b/recipes-containers/lxc/files/lxc-fix-B-S.patch
@@ -0,0 +1,17 @@
+Index: lxc-1.0.7/config/init/upstart/Makefile.am
+===================================================================
+--- lxc-1.0.7.orig/config/init/upstart/Makefile.am
++++ lxc-1.0.7/config/init/upstart/Makefile.am
+@@ -3,9 +3,9 @@ EXTRA_DIST = lxc.conf lxc-instance.conf
+ if INIT_SCRIPT_UPSTART
+ install-upstart: lxc.conf lxc-instance.conf lxc-net.conf
+ 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/init/
+-	$(INSTALL_DATA) lxc.conf $(DESTDIR)$(sysconfdir)/init/
+-	$(INSTALL_DATA) lxc-instance.conf $(DESTDIR)$(sysconfdir)/init/
+-	$(INSTALL_DATA) lxc-net.conf $(DESTDIR)$(sysconfdir)/init/
++	$(INSTALL_DATA) $(srcdir)/lxc.conf $(DESTDIR)$(sysconfdir)/init/
++	$(INSTALL_DATA) $(srcdir)/lxc-instance.conf $(DESTDIR)$(sysconfdir)/init/
++	$(INSTALL_DATA) $(srcdir)/lxc-net.conf $(DESTDIR)$(sysconfdir)/init/
+ 
+ uninstall-upstart:
+ 	rm -f $(DESTDIR)$(sysconfdir)/init/lxc.conf
diff --git a/recipes-containers/lxc/lxc_1.0.7.bb b/recipes-containers/lxc/lxc_1.0.7.bb
index 1c70958..d82aa70 100644
--- a/recipes-containers/lxc/lxc_1.0.7.bb
+++ b/recipes-containers/lxc/lxc_1.0.7.bb
@@ -30,6 +30,7 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \
 	file://document-lxc.rebootsignal.patch \
 	file://lxc-busybox-use-lxc.rebootsignal-SIGTERM.patch \
 	file://ppc-add-seccomp-support-for-lxc.patch \
+	file://lxc-fix-B-S.patch \
 	"
 
 SRC_URI[md5sum] = "b48f468a9bef0e4e140dd723f0a65ad0"
-- 
2.1.4

Re: [PATCH 2/3] lxc: include systemd files into lxc-setup

[Bruce Ashfield]

systemd and lxc are broken in quite a few ways at the moment. I've just
finished fixing things up, so I tossed this on the queue and will push all
the changes shortly.

Bruce

On Thu, Apr 9, 2015 at 4:01 PM, Dmitry Eremin-Solenikov
<dmitry_eremin@mentor.com> wrote:
> lxc-setup package accumulates all initscripts, so it should also include
> systemd service files.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
> ---
>  recipes-containers/lxc/lxc_1.0.7.bb | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/recipes-containers/lxc/lxc_1.0.7.bb b/recipes-containers/lxc/lxc_1.0.7.bb
> index c9eef75..1c70958 100644
> --- a/recipes-containers/lxc/lxc_1.0.7.bb
> +++ b/recipes-containers/lxc/lxc_1.0.7.bb
> @@ -72,6 +72,7 @@ RDEPENDS_${PN}-templates += "bash"
>
>  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"
>
>  PRIVATE_LIBS_${PN}-ptest = "liblxc.so.1"
> --
> 2.1.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"