On 14-05-07 12:52 PM, Mark Asselstine wrote:
Poky commit 69b6eaca3d9b635e8a61a0fdbd814b558e91901d [autotools: Enable separate builddir by default] enforced separate build directories, which is supported by automake. Unfortunately lxc had a few make directives which didn't take into account VPATH builds so fixing them up here to allow the lxc build to complete successfully.
Both look fine to me. Merged and pushed to master. Bruce
Signed-off-by: Mark Asselstine <[email protected]> --- ...tomake-ensure-VPATH-builds-work-correctly.patch | 45 ++++++++++++++++++++++ recipes-containers/lxc/lxc_1.0.1.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 recipes-containers/lxc/files/automake-ensure-VPATH-builds-work-correctly.patch 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 new file mode 100644 index 0000000..2a91951 --- /dev/null +++ b/recipes-containers/lxc/files/automake-ensure-VPATH-builds-work-correctly.patch @@ -0,0 +1,45 @@ +From 08ccd79319e66b3f0b51fd5f5b539e652a16dfc0 Mon Sep 17 00:00:00 2001 +From: Mark Asselstine <[email protected]> +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 <[email protected]> +--- + 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.1.bb b/recipes-containers/lxc/lxc_1.0.1.bb index b366116..4ef80d6 100644 --- a/recipes-containers/lxc/lxc_1.0.1.bb +++ b/recipes-containers/lxc/lxc_1.0.1.bb @@ -29,6 +29,7 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \ file://network.c-Add-missing-LXC_NET_NONE-option-refactor.patch \ file://runtest.patch \ file://run-ptest \ + file://automake-ensure-VPATH-builds-work-correctly.patch \ " SRC_URI[md5sum] = "3c7379891e45713817ec873a167070b0" SRC_URI[sha256sum] = "17d8e5b575207b4fb57da0b8ba2d13f3e5ee20ce8ccd1259d6eae4bd5ca575b1"
-- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
