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>

2 files changed, 2 insertions, 48 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 @@
-From 08ccd79319e66b3f0b51fd5f5b539e652a16dfc0 Mon Sep 17 00:00:00 2001
-From: Mark Asselstine <mark.asselstine@windriver.com>
-Date: Wed, 30 Apr 2014 11:06:12 -0400
-Subject: [PATCH] automake: ensure VPATH builds work correctly
-
-There were a few non-VPATH friendly directives in some Makefile.am files, fix
-these up to allow VPATH builds to work.
-
-Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
----
- config/etc/Makefile.am | 4 ++--
- src/tests/Makefile.am  | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config/etc/Makefile.am b/config/etc/Makefile.am
-index 81d7709..dca001e 100644
---- a/config/etc/Makefile.am
-+++ b/config/etc/Makefile.am
-@@ -4,8 +4,8 @@ distroconf = @LXC_DISTRO_CONF@
- 
- EXTRA_DIST = default.conf.ubuntu default.conf.libvirt default.conf.unknown
- 
--default.conf:
--       cp $(distroconf) $@
-+default.conf: $(distroconf)
-+       cp $? $@
- 
- clean-local:
-        @$(RM) -f default.conf
-diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
-index 7f6645b..641e207 100644
---- a/src/tests/Makefile.am
-+++ b/src/tests/Makefile.am
-@@ -64,7 +64,7 @@ buildtest-TESTS: $(TESTS)
- install-ptest:
-        install -d $(TEST_DIR)
-        install -D ../lxc/liblxc.so $(TEST_DIR)/../lxc/liblxc.so
--       install -D ../../config/test-driver $(TEST_DIR)/../../config/test-driver
-+       install -D $(top_srcdir)/config/test-driver $(TEST_DIR)/../../config/test-driver
-        cp Makefile $(TEST_DIR)
-        @(for file in $(TESTS); do install $$file $(TEST_DIR);  done;)
-        sed -i 's|^Makefile:|_Makefile:|' $(TEST_DIR)/Makefile
--- 
-1.8.3.2
-
diff --git a/recipes-containers/lxc/lxc_1.0.5.bb b/recipes-containers/lxc/lxc_1.0.6.bb
index 232a3d07..5b1eb0aa 100644
--- a/recipes-containers/lxc/lxc_1.0.5.bb
+++ b/recipes-containers/lxc/lxc_1.0.6.bb
@@ -25,10 +25,9 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \
         file://lxc-1.0.0-disable-udhcp-from-busybox-template.patch \
         file://runtest.patch \
         file://run-ptest \
-        file://automake-ensure-VPATH-builds-work-correctly.patch \
         "
-SRC_URI[md5sum] = "9d9af9e9e69a831cd50b58d91c786013"
-SRC_URI[sha256sum] = "02ac82e69a76d424e5443b9c577e84a8eaafcebf17cfd865eedee147e8ef8844"
+SRC_URI[md5sum] = "4aad3aee84b42faa194e44091d723a3b"
+SRC_URI[sha256sum] = "fc6bffa750f00daaa92aa33d719c1cc235146aa779ebd2a64a0c24423977cf14"
 
 S = "${WORKDIR}/${BPN}-${PV}"