diff options
| author | Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> | 2015-04-09 23:01:48 +0300 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-04-11 00:20:49 -0400 |
| commit | 23e15f52a09ae506b2bab1bb2dbdc690116e521b (patch) | |
| tree | e3a5f41262e8c8c7e8132b94341e23d8d9b7891f /recipes-containers/lxc/files | |
| parent | 3ba78da0d3637ae4f7699105ed00e8505a537d44 (diff) | |
| download | meta-virtualization-23e15f52a09ae506b2bab1bb2dbdc690116e521b.tar.gz | |
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 <dmitry_eremin@mentor.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/lxc/files')
| -rw-r--r-- | recipes-containers/lxc/files/lxc-fix-B-S.patch | 17 |
1 files changed, 17 insertions, 0 deletions
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 @@ | |||
| 1 | Index: lxc-1.0.7/config/init/upstart/Makefile.am | ||
| 2 | =================================================================== | ||
| 3 | --- lxc-1.0.7.orig/config/init/upstart/Makefile.am | ||
| 4 | +++ lxc-1.0.7/config/init/upstart/Makefile.am | ||
| 5 | @@ -3,9 +3,9 @@ EXTRA_DIST = lxc.conf lxc-instance.conf | ||
| 6 | if INIT_SCRIPT_UPSTART | ||
| 7 | install-upstart: lxc.conf lxc-instance.conf lxc-net.conf | ||
| 8 | $(MKDIR_P) $(DESTDIR)$(sysconfdir)/init/ | ||
| 9 | - $(INSTALL_DATA) lxc.conf $(DESTDIR)$(sysconfdir)/init/ | ||
| 10 | - $(INSTALL_DATA) lxc-instance.conf $(DESTDIR)$(sysconfdir)/init/ | ||
| 11 | - $(INSTALL_DATA) lxc-net.conf $(DESTDIR)$(sysconfdir)/init/ | ||
| 12 | + $(INSTALL_DATA) $(srcdir)/lxc.conf $(DESTDIR)$(sysconfdir)/init/ | ||
| 13 | + $(INSTALL_DATA) $(srcdir)/lxc-instance.conf $(DESTDIR)$(sysconfdir)/init/ | ||
| 14 | + $(INSTALL_DATA) $(srcdir)/lxc-net.conf $(DESTDIR)$(sysconfdir)/init/ | ||
| 15 | |||
| 16 | uninstall-upstart: | ||
| 17 | rm -f $(DESTDIR)$(sysconfdir)/init/lxc.conf | ||