On Thu, May 14, 2015 at 9:24 PM, <[email protected]> wrote: > From: Roy Li <[email protected]> > > Remove libvirt-Fix-cannot-symlink-cpu_map.xml-error.patch, since > rules for install *.xml are changed, the race issue does not exist. >
Thanks Roy. The changes have been merged. Bruce > Signed-off-by: Roy Li <[email protected]> > --- > recipes-extended/libvirt/libvirt-python.inc | 4 +-- > ...virt-Fix-cannot-symlink-cpu_map.xml-error.patch | 34 > ---------------------- > .../{libvirt_1.2.12.bb => libvirt_1.2.15.bb} | 7 ++--- > 3 files changed, 5 insertions(+), 40 deletions(-) > delete mode 100644 > recipes-extended/libvirt/libvirt/libvirt-Fix-cannot-symlink-cpu_map.xml-error.patch > rename recipes-extended/libvirt/{libvirt_1.2.12.bb => libvirt_1.2.15.bb} > (97%) > > diff --git a/recipes-extended/libvirt/libvirt-python.inc > b/recipes-extended/libvirt/libvirt-python.inc > index 21cfa55..550236a 100644 > --- a/recipes-extended/libvirt/libvirt-python.inc > +++ b/recipes-extended/libvirt/libvirt-python.inc > @@ -18,8 +18,8 @@ FILES_${PN}-python = "${bindir}/* ${libdir}/* > ${libdir}/${PYTHON_DIR}/*" > SRC_URI += > "http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python"; > SRC_URI += > "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}" > > -SRC_URI[libvirt_python.md5sum] = "4255f2bfece23aacbc8d94256598b302" > -SRC_URI[libvirt_python.sha256sum] = > "432f438f9759e216424490f51a8804398b70fb1b2f2211f45fb05f72f5ad849f" > +SRC_URI[libvirt_python.md5sum] = "f13b566b54fe71ec0f26992aee11dd09" > +SRC_URI[libvirt_python.sha256sum] = > "9a6dfbd487d49f887a41aca4bfb1b4e043fd9fbdfc041252cae84023f5c387ba" > > export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml" > export LIBVIRT_CFLAGS = "-I${S}/include" > 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 > deleted file mode 100644 > index 090bc6e..0000000 > --- > a/recipes-extended/libvirt/libvirt/libvirt-Fix-cannot-symlink-cpu_map.xml-error.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -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 <[email protected]> > - > ---- > - 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.15.bb > similarity index 97% > rename from recipes-extended/libvirt/libvirt_1.2.12.bb > rename to recipes-extended/libvirt/libvirt_1.2.15.bb > index 298da2b..8abd41e 100644 > --- a/recipes-extended/libvirt/libvirt_1.2.12.bb > +++ b/recipes-extended/libvirt/libvirt_1.2.15.bb > @@ -30,12 +30,11 @@ 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 \ > file://libvirt-use-pkg-config-to-locate-libcap.patch \ > " > > -SRC_URI[libvirt.md5sum] = "2ae99535265ce4687d8718d744024c27" > -SRC_URI[libvirt.sha256sum] = > "eff5227f774560d97f0b44402a444e821c51e8cd44add89f74bc3c1f4dede66a" > +SRC_URI[libvirt.md5sum] = "08c2ea825d076ee67b1bbc600c220b97" > +SRC_URI[libvirt.sha256sum] = > "5f88041b8c212f8f687c672fe583108833240d6175b512ce4de92ab6660194c6" > > inherit autotools gettext update-rc.d pkgconfig ptest > > @@ -102,7 +101,7 @@ FILES_${PN}-libvirtd = "${sysconfdir}/init.d \ > ${sysconfdir}/sysctl.d \ > ${sysconfdir}/logrotate.d \ > ${sysconfdir}/libvirt/libvirtd.conf \ > - /usr/lib/sysctl.d/libvirtd.conf \ > + /usr/lib/sysctl.d/60-libvirtd.conf \ > ${sbindir}/libvirtd" > > FILES_${PN}-virsh = "${bindir}/virsh" > -- > 1.9.1 > > -- > _______________________________________________ > meta-virtualization mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-virtualization -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
