On Mon, Mar 23, 2015 at 01:48:06PM -0400, Amy Fong wrote:
> >From 73172eeed1fcffcfae088a3059fbca0689b7437f Mon Sep 17 00:00:00 2001
> From: Amy Fong <amy.fong@xxxxxxxxxxxxx>
> Date: Mon, 23 Mar 2015 13:44:03 -0400
> Subject: [PATCH] libvirt: '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@xxxxxxxxxxxxx>
> ---
> src/Makefile.am | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 00b47e7..2e4a520 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -1039,6 +1039,7 @@ libvirt_cpu_la_SOURCES = $(CPU_SOURCES)
> 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 $@
>
This symlink is no longer needed, this whole rule can be deleted.
I can amend the patch to delete it completely if you're ok with that.
It is the last remaining hunk of commit e562e82f
Load CPU map from builddir when run uninstalled
- part of it was reverted by commit dd47723
Use virFileFindResource to locate CPU map XML
and the symlink was made redundant by commit bc6e2063
Search for schemas and cpu_map.xml in source tree
Jan
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list