From 23e15f52a09ae506b2bab1bb2dbdc690116e521b Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Thu, 9 Apr 2015 23:01:48 +0300 Subject: lxc: fix building when B != S 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 Signed-off-by: Bruce Ashfield --- 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 (limited to 'recipes-containers/lxc') 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 00000000..3822655e --- /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 55da522f..0da1e37f 100644 --- a/recipes-containers/lxc/lxc_1.0.7.bb +++ b/recipes-containers/lxc/lxc_1.0.7.bb @@ -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" -- cgit v1.2.3-54-g00ecf