MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxc: fix building when B != S

Browse Source 
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>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Dmitry Eremin-Solenikov 2015-04-09 23:01:48 +03:00 committed by Bruce Ashfield
parent 3ba78da0d3
commit 23e15f52a0
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
recipes-containers/lxc/files/lxc-fix-B-S.patch Normal file
View File

@ -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

1
recipes-containers/lxc/lxc_1.0.7.bb
View File

@ -31,6 +31,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"