From 61cec3e210f58e0c6d05cde1012d0cf6ea072795 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 10 Jul 2024 03:45:58 +0000 Subject: libvirt: update to v10.5.0 and convert to git Rather than waiting for release tarballs for the main libvirt release, we can just use the git repository directory and avoid patch backporting for CVEs, etc. As part of this change, we adjust to git, refresh our meson build patch, and add a new meson patch for the tests. We also split out LIBVIRT_VERSION, so that nested builds can use it to locate tarballs. Signed-off-by: Bruce Ashfield --- recipes-extended/libvirt/libvirt-python.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes-extended/libvirt/libvirt-python.inc') diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc index 40c362d6..471d33d6 100644 --- a/recipes-extended/libvirt/libvirt-python.inc +++ b/recipes-extended/libvirt/libvirt-python.inc @@ -18,9 +18,9 @@ FILES:${PN}-python = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" # Currently the libvirt-python debug libraries contain buildpaths INSANE_SKIP:${PN}-dbg += "buildpaths" -SRC_URI += "http://libvirt.org/sources/python/${BPN}-python-${PV}.tar.gz;name=libvirt_python;subdir=${BP}" +SRC_URI += "http://libvirt.org/sources/python/${BPN}-python-${LIBVIRT_VERSION}.tar.gz;name=libvirt_python;subdir=${BP}" -SRC_URI[libvirt_python.sha256sum] = "a82588f0e7db53eda7b7dbcbc448b0ec43e00a8c77cac69644495299b410c20d" +SRC_URI[libvirt_python.sha256sum] = "785023500f58d3e8e829af98647d43eee97e517aacc9d9e7ded43594ea52d032" export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml" export LIBVIRT_CFLAGS = "-I${S}/include" @@ -46,7 +46,7 @@ do_compile:append() { # the syroot staged pkgconfig entries. So we clear the sysroot # for just this portion. export PKG_CONFIG_SYSROOT_DIR= - cd ${S}/${BPN}-python-${PV} && \ + cd ${UNPACKDIR}/${BP}/${BPN}-python-${LIBVIRT_VERSION} && \ ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py build cd - fi @@ -58,7 +58,7 @@ do_install:append() { # the syroot staged pkgconfig entries. So we clear the sysroot # for just this portion. export PKG_CONFIG_SYSROOT_DIR= - cd ${S}/${BPN}-python-${PV} && \ + cd ${UNPACKDIR}/${BP}/${BPN}-python-${LIBVIRT_VERSION} && \ ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py install \ --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${LIBVIRT_INSTALL_ARGS} cd - -- cgit v1.2.3-54-g00ecf