[meta-virtualization] [PATCH] libvirt: do_compile fails 'src/cpu/cpu_map.xml': No such file or directory

[Bruce Ashfield]

merged.

Bruce

On Mon, Mar 23, 2015 at 1:33 PM, Amy Fong <amy.fong at windriver.com> wrote:
> From b80338aa436fa115cc0c8d9b7fc5345d4171c56a Mon Sep 17 00:00:00 2001
> From: Amy Fong <amy.fong at windriver.com>
> Date: Mon, 23 Mar 2015 13:29:39 -0400
> Subject: [PATCH] libvirt: do_compile fails 'src/cpu/cpu_map.xml': No such file
>  or directory'
>
> In some circumstances where the build tree differs from the source,
> libvirt's compile will try to create the symlink for cpu_map.xml before
> creating the directory $(abs_builddir)/cpu.
>
> Add a test to create this directory if it hasn't already been created.
>
> Signed-off-by: Amy Fong <amy.fong at windriver.com>
> ---
>  ...virt-Fix-cannot-symlink-cpu_map.xml-error.patch | 34 ++++++++++++++++++++++
>  recipes-extended/libvirt/libvirt_1.2.12.bb         |  1 +
>  2 files changed, 35 insertions(+)
>  create mode 100644 recipes-extended/libvirt/libvirt/libvirt-Fix-cannot-symlink-cpu_map.xml-error.patch
>
> diff --git a/recipes-extended/libvirt/libvirt/libvirt-Fix-cannot-symlink-cpu_map.xml-error.patch b/recipes-extended/libvirt/libvirt/libvirt-Fix-cannot-symlink-cpu_map.xml-error.patch
> new file mode 100644
> index 0000000..090bc6e
> --- /dev/null
> +++ b/recipes-extended/libvirt/libvirt/libvirt-Fix-cannot-symlink-cpu_map.xml-error.patch
> @@ -0,0 +1,34 @@
> +libvirt: do_compile fails 'src/cpu/cpu_map.xml': No such file or directory'
> +
> +In some very rare circumstances, libvirt's compile will try to create the
> +symlink for cpu_map.xml before creating the directory $(abs_builddir)/cpu.
> +
> +Add a test to create this directory if it hasn't already been created.
> +
> +Signed-off-by: Amy Fong <amy.fong at windriver.com>
> +
> +---
> + src/Makefile.am |    1 +
> + src/Makefile.in |    1 +
> + 2 files changed, 2 insertions(+)
> +
> +--- a/src/Makefile.am
> ++++ b/src/Makefile.am
> +@@ -1053,6 +1053,7 @@
> + libvirt_cpu_la_DEPENDENCIES = $(abs_builddir)/cpu/cpu_map.xml
> +
> + $(abs_builddir)/cpu/cpu_map.xml:
> ++      if [ ! -d $(abs_builddir)/cpu ]; then $(MKDIR_P) $(abs_builddir)/cpu/; fi
> +       $(AM_V_GEN)ln -s $(abs_srcdir)/cpu/cpu_map.xml $@
> +
> + if WITH_VMX
> +--- a/src/Makefile.in
> ++++ b/src/Makefile.in
> +@@ -10338,6 +10338,7 @@
> +         $(srcdir)/lxc/lxc_controller_dispatch.h
> +
> + $(abs_builddir)/cpu/cpu_map.xml:
> ++      if [ ! -d $(abs_builddir)/cpu ]; then $(MKDIR_P) $(abs_builddir)/cpu/; fi
> +       $(AM_V_GEN)ln -s $(abs_srcdir)/cpu/cpu_map.xml $@
> +
> + %protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl
> diff --git a/recipes-extended/libvirt/libvirt_1.2.12.bb b/recipes-extended/libvirt/libvirt_1.2.12.bb
> index ef46e22..dca2d1b 100644
> --- a/recipes-extended/libvirt/libvirt_1.2.12.bb
> +++ b/recipes-extended/libvirt/libvirt_1.2.12.bb
> @@ -30,6 +30,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \
>             file://runptest.patch \
>             file://run-ptest \
>             file://tests-allow-separated-src-and-build-dirs.patch \
> +           file://libvirt-Fix-cannot-symlink-cpu_map.xml-error.patch \
>            "
>
>  SRC_URI[libvirt.md5sum] = "2ae99535265ce4687d8718d744024c27"
> --
> 2.1.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"