Rework patch 5b57bf462b41142deae0479c06f4da8e0b66bb7e [lxc: fixup VPATH builds] since the new version of LXC refactored one of the files and it no longer applies. Provide a fix for what's left.
Signed-off-by: Bogdan Purcareata <[email protected]> --- .../automake-ensure-VPATH-builds-correctly.patch | 26 ++++++++++++++++++++ recipes-containers/lxc/lxc_1.0.6.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 recipes-containers/lxc/files/automake-ensure-VPATH-builds-correctly.patch diff --git a/recipes-containers/lxc/files/automake-ensure-VPATH-builds-correctly.patch b/recipes-containers/lxc/files/automake-ensure-VPATH-builds-correctly.patch new file mode 100644 index 0000000..2b5c853 --- /dev/null +++ b/recipes-containers/lxc/files/automake-ensure-VPATH-builds-correctly.patch @@ -0,0 +1,26 @@ +From fe23085d9a40d6d78387d9ce8ddb65785fe8d6e5 Mon Sep 17 00:00:00 2001 +From: Bogdan Purcareata <[email protected]> +Date: Thu, 2 Oct 2014 18:31:50 -0400 +Subject: [PATCH] automake: ensure VPATH builds correctly + +Signed-off-by: Bogdan Purcareata <[email protected]> +--- + src/tests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am +index d74c10d..6225f78 100644 +--- a/src/tests/Makefile.am ++++ b/src/tests/Makefile.am +@@ -66,7 +66,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.7.10.4 + diff --git a/recipes-containers/lxc/lxc_1.0.6.bb b/recipes-containers/lxc/lxc_1.0.6.bb index 5b1eb0a..2d384dd 100644 --- a/recipes-containers/lxc/lxc_1.0.6.bb +++ b/recipes-containers/lxc/lxc_1.0.6.bb @@ -25,6 +25,7 @@ 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-correctly.patch \ " SRC_URI[md5sum] = "4aad3aee84b42faa194e44091d723a3b" SRC_URI[sha256sum] = "fc6bffa750f00daaa92aa33d719c1cc235146aa779ebd2a64a0c24423977cf14" -- 1.7.10.4 -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
