summaryrefslogtreecommitdiffstats
path: root/recipes-containers/lxc/files
diff options
context:
space:
mode:
authorBogdan Purcareata <bogdan.purcareata@freescale.com>2014-10-02 19:01:17 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-10-02 22:57:10 -0400
commit246fc0bfafa457b039ad3001cb47e02eb8523b24 (patch)
treefb791a2ddc27c2b21074d58e73c4218e7bcf5722 /recipes-containers/lxc/files
parent7a7254d6d0798bac1f733ede9ba69488d36921d9 (diff)
downloadmeta-virtualization-246fc0bfafa457b039ad3001cb47e02eb8523b24.tar.gz
lxc: Update version to 1.0.6
Also remove patch file that no longer applies. Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/lxc/files')
-rw-r--r--recipes-containers/lxc/files/automake-ensure-VPATH-builds-work-correctly.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/recipes-containers/lxc/files/automake-ensure-VPATH-builds-work-correctly.patch b/recipes-containers/lxc/files/automake-ensure-VPATH-builds-work-correctly.patch
deleted file mode 100644
index 2a919513..00000000
--- a/recipes-containers/lxc/files/automake-ensure-VPATH-builds-work-correctly.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 08ccd79319e66b3f0b51fd5f5b539e652a16dfc0 Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Wed, 30 Apr 2014 11:06:12 -0400
4Subject: [PATCH] automake: ensure VPATH builds work correctly
5
6There were a few non-VPATH friendly directives in some Makefile.am files, fix
7these up to allow VPATH builds to work.
8
9Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
10---
11 config/etc/Makefile.am | 4 ++--
12 src/tests/Makefile.am | 2 +-
13 2 files changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/config/etc/Makefile.am b/config/etc/Makefile.am
16index 81d7709..dca001e 100644
17--- a/config/etc/Makefile.am
18+++ b/config/etc/Makefile.am
19@@ -4,8 +4,8 @@ distroconf = @LXC_DISTRO_CONF@
20
21 EXTRA_DIST = default.conf.ubuntu default.conf.libvirt default.conf.unknown
22
23-default.conf:
24- cp $(distroconf) $@
25+default.conf: $(distroconf)
26+ cp $? $@
27
28 clean-local:
29 @$(RM) -f default.conf
30diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
31index 7f6645b..641e207 100644
32--- a/src/tests/Makefile.am
33+++ b/src/tests/Makefile.am
34@@ -64,7 +64,7 @@ buildtest-TESTS: $(TESTS)
35 install-ptest:
36 install -d $(TEST_DIR)
37 install -D ../lxc/liblxc.so $(TEST_DIR)/../lxc/liblxc.so
38- install -D ../../config/test-driver $(TEST_DIR)/../../config/test-driver
39+ install -D $(top_srcdir)/config/test-driver $(TEST_DIR)/../../config/test-driver
40 cp Makefile $(TEST_DIR)
41 @(for file in $(TESTS); do install $$file $(TEST_DIR); done;)
42 sed -i 's|^Makefile:|_Makefile:|' $(TEST_DIR)/Makefile
43--
441.8.3.2
45