* [PATCH 1/2] lxc: fixup VPATH builds
@ 2014-05-07 16:52 Mark Asselstine
2014-05-07 16:52 ` [PATCH 2/2] libvirt: allow separated src and build dirs Mark Asselstine
2014-05-08 16:38 ` [PATCH 1/2] lxc: fixup VPATH builds Bruce Ashfield
0 siblings, 2 replies; 3+ messages in thread
From: Mark Asselstine @ 2014-05-07 16:52 UTC (permalink / raw)
To: bruce.ashfield; +Cc: mark.asselstine, meta-virtualization
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.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
...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 <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.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"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] libvirt: allow separated src and build dirs
2014-05-07 16:52 [PATCH 1/2] lxc: fixup VPATH builds Mark Asselstine
@ 2014-05-07 16:52 ` Mark Asselstine
2014-05-08 16:38 ` [PATCH 1/2] lxc: fixup VPATH builds Bruce Ashfield
1 sibling, 0 replies; 3+ messages in thread
From: Mark Asselstine @ 2014-05-07 16:52 UTC (permalink / raw)
To: bruce.ashfield; +Cc: mark.asselstine, meta-virtualization
Poky commit 69b6eaca3d9b635e8a61a0fdbd814b558e91901d [autotools:
Enable separate builddir by default] enforced separate build
directories, which is supported by automake. Make some minor updates
to the recipes and upstream source to allow builds to work with
separated src and build directories.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
recipes-extended/libvirt/libvirt-python.inc | 4 +-
.../tests-allow-separated-src-and-build-dirs.patch | 57 ++++++++++++++++++++++
recipes-extended/libvirt/libvirt_1.2.2.bb | 1 +
3 files changed, 60 insertions(+), 2 deletions(-)
create mode 100644 recipes-extended/libvirt/libvirt/tests-allow-separated-src-and-build-dirs.patch
diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index 195a9de..181e9d3 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -23,8 +23,8 @@ SRC_URI[libvirt_python.sha256sum] = "94d79d662b6010f6c688b8856b2d95077736d48ffa3
export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
export LIBVIRT_CFLAGS = "-I${S}/include"
-export LIBVIRT_LIBS = "-L${S}/src/.libs -lvirt -ldl"
-export LDFLAGS="-L${S}/src/.libs"
+export LIBVIRT_LIBS = "-L${B}/src/.libs -lvirt -ldl"
+export LDFLAGS="-L${B}/src/.libs"
LIBVIRT_INSTALL_ARGS = "--root=${D} \
--prefix=${prefix} \
diff --git a/recipes-extended/libvirt/libvirt/tests-allow-separated-src-and-build-dirs.patch b/recipes-extended/libvirt/libvirt/tests-allow-separated-src-and-build-dirs.patch
new file mode 100644
index 0000000..3964865
--- /dev/null
+++ b/recipes-extended/libvirt/libvirt/tests-allow-separated-src-and-build-dirs.patch
@@ -0,0 +1,57 @@
+From 884b6e3724b75cd92766d5386455983e3557a286 Mon Sep 17 00:00:00 2001
+From: Mark Asselstine <mark.asselstine@windriver.com>
+Date: Fri, 2 May 2014 13:45:05 -0400
+Subject: [PATCH] tests: allow separated src and build dirs
+
+Fixup Makefile.am to search for static files back in srcdir.
+
+Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
+---
+ tests/Makefile.am | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 0da514b..b8d7c19 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1006,22 +1006,22 @@ install-ptest:
+ @(if [ -d ../tools/.libs ] ; then cd ../tools/.libs; fi; \
+ install * $(DEST_DIR)/tools)
+ install -d $(DEST_DIR)/src/network
+- cp ../src/network/*.xml $(DEST_DIR)/src/network
++ cp $(top_srcdir)/src/network/*.xml $(DEST_DIR)/src/network
+ install -d $(DEST_DIR)/src/cpu
+- cp ../src/cpu/*.xml $(DEST_DIR)/src/cpu
++ cp $(top_srcdir)/src/cpu/*.xml $(DEST_DIR)/src/cpu
+ install ../src/libvirt_iohelper $(DEST_DIR)/src
+ install -D ../daemon/libvirtd $(DEST_DIR)/daemon/libvirtd
+- install -D ../daemon/libvirtd.conf $(DEST_DIR)/daemon/libvirtd.conf
++ install -D $(top_srcdir)/daemon/libvirtd.conf $(DEST_DIR)/daemon/libvirtd.conf
+ @(if [ -d ../daemon/.libs ] ; then cd ../daemon/.libs; fi; \
+ install * $(DEST_DIR)/daemon)
+ install -d $(DEST_DIR)/src/.libs
+ @(if [ -d ../src/.libs ] ; then cd ../src/.libs; fi; \
+ install * $(DEST_DIR)/src/.libs)
+ install -d $(DEST_DIR)/docs/schemas
+- cp ../docs/schemas/*.rng $(DEST_DIR)/docs/schemas
+- cp -r ../build-aux $(DEST_DIR)
++ cp $(top_srcdir)/docs/schemas/*.rng $(DEST_DIR)/docs/schemas
++ cp -r $(top_srcdir)/build-aux $(DEST_DIR)
+ install -d $(DEST_DIR)/examples/xml
+- cp -r ../examples/xml/test $(DEST_DIR)/examples/xml
++ cp -r $(top_srcdir)/examples/xml/test $(DEST_DIR)/examples/xml
+ install -d $(DEST_DIR)/tests/.libs
+ find . -type d -name "*xml2xml*" -exec cp -r {} $(DEST_DIR)/tests \;
+ find . -type d -name "*data" -exec cp -r {} $(DEST_DIR)/tests \;
+@@ -1029,7 +1029,7 @@ install-ptest:
+ if [ -f .libs/$$file ]; then \
+ install .libs/$$file $(DEST_DIR)/tests; \
+ else \
+- install $$file $(DEST_DIR)/tests; \
++ install $(srcdir)/$$file $(DEST_DIR)/tests; \
+ fi; \
+ done;)
+ @(if [ -d .libs ]; then install .libs/*.so $(DEST_DIR)/tests/.libs; fi;)
+--
+1.8.3.2
+
diff --git a/recipes-extended/libvirt/libvirt_1.2.2.bb b/recipes-extended/libvirt/libvirt_1.2.2.bb
index a66a6ad..22ae2c7 100644
--- a/recipes-extended/libvirt/libvirt_1.2.2.bb
+++ b/recipes-extended/libvirt/libvirt_1.2.2.bb
@@ -29,6 +29,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \
file://libvirtd.conf \
file://runptest.patch \
file://run-ptest \
+ file://tests-allow-separated-src-and-build-dirs.patch \
"
SRC_URI[libvirt.md5sum] = "592958ad1ddce7574d8cb0a31e635acd"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] lxc: fixup VPATH builds
2014-05-07 16:52 [PATCH 1/2] lxc: fixup VPATH builds Mark Asselstine
2014-05-07 16:52 ` [PATCH 2/2] libvirt: allow separated src and build dirs Mark Asselstine
@ 2014-05-08 16:38 ` Bruce Ashfield
1 sibling, 0 replies; 3+ messages in thread
From: Bruce Ashfield @ 2014-05-08 16:38 UTC (permalink / raw)
To: Mark Asselstine; +Cc: meta-virtualization
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 <mark.asselstine@windriver.com>
> ---
> ...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 <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.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"
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-08 16:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-07 16:52 [PATCH 1/2] lxc: fixup VPATH builds Mark Asselstine
2014-05-07 16:52 ` [PATCH 2/2] libvirt: allow separated src and build dirs Mark Asselstine
2014-05-08 16:38 ` [PATCH 1/2] lxc: fixup VPATH builds Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.