From 9e30cf30582932c0d42449896b52ba403310fc68 Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Thu, 19 Jan 2023 17:24:12 +0800 Subject: libvirt: fix libraries contain build folder path cause QA warning libvirt debug trace contains source path, and some utils was located to yocto sysroot folder, those full source path cause yocto QA buildpath check failed and report "xxxx contains reference to TMPDIR" warnings. Signed-off-by: Xiangyu Chen Signed-off-by: Bruce Ashfield --- ...d-remove-build-path-information-to-avoid-.patch | 58 ++++++++++++++++++++++ recipes-extended/libvirt/libvirt_8.1.0.bb | 1 + 2 files changed, 59 insertions(+) create mode 100644 recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch diff --git a/recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch b/recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch new file mode 100644 index 00000000..1e09cd68 --- /dev/null +++ b/recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch @@ -0,0 +1,58 @@ +From 9660b76325c841a5f5c7d5b2fb439a1fd64105c9 Mon Sep 17 00:00:00 2001 +From: Xiangyu Chen +Date: Thu, 19 Jan 2023 17:07:37 +0800 +Subject: [PATCH] messon.build: remove build path information to avoid yocto QA + buildpath check warnings + +libvirt debug trace contains source path, and some utils was located to +yocto sysroot folder, those full source path cause yocto QA buildpath check failed and report warnings as below: + +WARNING: libvirt-8.1.0-r0 do_package_qa: QA Issue: File /usr/libexec/libvirt_lxc in package libvirt contains reference to TMPDIR +File /usr/lib64/libvirt.so.0.8001.0 in package libvirt contains reference to TMPDIR +File /usr/lib64/libvirt/lock-driver/lockd.so in package libvirt contains reference to TMPDIR +File /usr/lib64/libvirt/connection-driver/libvirt_driver_lxc.so in package libvirt contains reference to TMPDIR +File /usr/lib64/libvirt/connection-driver/libvirt_driver_storage.so in package libvirt contains reference to TMPDIR +File /usr/lib64/libvirt/connection-driver/libvirt_driver_network.so in package libvirt contains reference to TMPDIR +File /usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so in package libvirt contains reference to TMPDIR +File /usr/lib64/libvirt/storage-backend/libvirt_storage_backend_disk.so in package libvirt contains reference to TMPDIR +File /usr/bin/virt-ssh-helper in package libvirt contains reference to TMPDIR [buildpaths] + + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Xiangyu Chen +--- + meson.build | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index 9016c04..fb78d44 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,8 +26,8 @@ endif + conf = configuration_data() + + conf.set('_GNU_SOURCE', 1) +-conf.set_quoted('abs_top_builddir', meson.build_root()) +-conf.set_quoted('abs_top_srcdir', meson.source_root()) ++conf.set_quoted('abs_top_builddir', ' ') ++conf.set_quoted('abs_top_srcdir', ' ') + conf.set_quoted('PACKAGE', meson.project_name()) + conf.set_quoted('PACKAGE_NAME', meson.project_name()) + conf.set_quoted('PACKAGE_VERSION', meson.project_version()) +@@ -1830,9 +1830,9 @@ if conf.has('WITH_LIBVIRTD') + use_storage = true + + conf.set('WITH_STORAGE_FS', 1) +- conf.set_quoted('MOUNT', mount_prog.path()) +- conf.set_quoted('UMOUNT', umount_prog.path()) +- conf.set_quoted('MKFS', mkfs_prog.path()) ++ conf.set_quoted('MOUNT', '/usr/bin/mount') ++ conf.set_quoted('UMOUNT', '/usr/bin/umount') ++ conf.set_quoted('MKFS', '/usr/sbin/mkfs') + + showmount_prog = find_program('showmount', required: false, dirs: libvirt_sbin_path) + showmount_path = '' +-- +2.17.1 + diff --git a/recipes-extended/libvirt/libvirt_8.1.0.bb b/recipes-extended/libvirt/libvirt_8.1.0.bb index 0ffd510b..d529db18 100644 --- a/recipes-extended/libvirt/libvirt_8.1.0.bb +++ b/recipes-extended/libvirt/libvirt_8.1.0.bb @@ -30,6 +30,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.xz;name=libvirt \ file://gnutls-helper.py \ file://0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch \ file://0001-prevent-gendispatch.pl-generating-build-path-in-code.patch \ + file://0001-messon.build-remove-build-path-information-to-avoid-.patch \ " SRC_URI[libvirt.sha256sum] = "3c6c43becffeb34a3f397c616206aa69a893ff8bf5e8208393c84e8e75352934" -- cgit v1.2.3-54-g00ecf