MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

libvirt: do_compile fails 'src/cpu/cpu_map.xml': No such file or directory'

Browse Source 
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@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Amy Fong 2015-03-23 13:29:39 -04:00 committed by Bruce Ashfield
parent 718987175a
commit 40dcc06946
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
recipes-extended/libvirt/libvirt/libvirt-Fix-cannot-symlink-cpu_map.xml-error.patch Normal file
View File

@ -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@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

1
recipes-extended/libvirt/libvirt_1.2.12.bb
View File

@ -30,6 +30,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \
file://runptest.patch \ file://runptest.patch \
file://run-ptest \ file://run-ptest \
file://tests-allow-separated-src-and-build-dirs.patch \ file://tests-allow-separated-src-and-build-dirs.patch \
file://libvirt-Fix-cannot-symlink-cpu_map.xml-error.patch \
" "
SRC_URI[libvirt.md5sum] = "2ae99535265ce4687d8718d744024c27" SRC_URI[libvirt.md5sum] = "2ae99535265ce4687d8718d744024c27"