summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiangyu Chen <xiangyu.chen@windriver.com>2023-01-19 17:24:12 +0800
committerBruce Ashfield <bruce.ashfield@gmail.com>2023-01-19 15:44:04 -0500
commit9e30cf30582932c0d42449896b52ba403310fc68 (patch)
treea6770340b272fd59eb72e32e4d11821f345d0677
parentf13ced4d8de6b4dbe03fa07f288d77d6f74b51db (diff)
downloadmeta-virtualization-9e30cf30582932c0d42449896b52ba403310fc68.tar.gz
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 <xiangyu.chen@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch58
-rw-r--r--recipes-extended/libvirt/libvirt_8.1.0.bb1
2 files changed, 59 insertions, 0 deletions
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 @@
1From 9660b76325c841a5f5c7d5b2fb439a1fd64105c9 Mon Sep 17 00:00:00 2001
2From: Xiangyu Chen <xiangyu.chen@windriver.com>
3Date: Thu, 19 Jan 2023 17:07:37 +0800
4Subject: [PATCH] messon.build: remove build path information to avoid yocto QA
5 buildpath check warnings
6
7libvirt debug trace contains source path, and some utils was located to
8yocto sysroot folder, those full source path cause yocto QA buildpath check failed and report warnings as below:
9
10WARNING: libvirt-8.1.0-r0 do_package_qa: QA Issue: File /usr/libexec/libvirt_lxc in package libvirt contains reference to TMPDIR
11File /usr/lib64/libvirt.so.0.8001.0 in package libvirt contains reference to TMPDIR
12File /usr/lib64/libvirt/lock-driver/lockd.so in package libvirt contains reference to TMPDIR
13File /usr/lib64/libvirt/connection-driver/libvirt_driver_lxc.so in package libvirt contains reference to TMPDIR
14File /usr/lib64/libvirt/connection-driver/libvirt_driver_storage.so in package libvirt contains reference to TMPDIR
15File /usr/lib64/libvirt/connection-driver/libvirt_driver_network.so in package libvirt contains reference to TMPDIR
16File /usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so in package libvirt contains reference to TMPDIR
17File /usr/lib64/libvirt/storage-backend/libvirt_storage_backend_disk.so in package libvirt contains reference to TMPDIR
18File /usr/bin/virt-ssh-helper in package libvirt contains reference to TMPDIR [buildpaths]
19
20
21Upstream-Status: Inappropriate [oe specific]
22
23Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
24---
25 meson.build | 10 +++++-----
26 1 file changed, 5 insertions(+), 5 deletions(-)
27
28diff --git a/meson.build b/meson.build
29index 9016c04..fb78d44 100644
30--- a/meson.build
31+++ b/meson.build
32@@ -26,8 +26,8 @@ endif
33 conf = configuration_data()
34
35 conf.set('_GNU_SOURCE', 1)
36-conf.set_quoted('abs_top_builddir', meson.build_root())
37-conf.set_quoted('abs_top_srcdir', meson.source_root())
38+conf.set_quoted('abs_top_builddir', ' ')
39+conf.set_quoted('abs_top_srcdir', ' ')
40 conf.set_quoted('PACKAGE', meson.project_name())
41 conf.set_quoted('PACKAGE_NAME', meson.project_name())
42 conf.set_quoted('PACKAGE_VERSION', meson.project_version())
43@@ -1830,9 +1830,9 @@ if conf.has('WITH_LIBVIRTD')
44 use_storage = true
45
46 conf.set('WITH_STORAGE_FS', 1)
47- conf.set_quoted('MOUNT', mount_prog.path())
48- conf.set_quoted('UMOUNT', umount_prog.path())
49- conf.set_quoted('MKFS', mkfs_prog.path())
50+ conf.set_quoted('MOUNT', '/usr/bin/mount')
51+ conf.set_quoted('UMOUNT', '/usr/bin/umount')
52+ conf.set_quoted('MKFS', '/usr/sbin/mkfs')
53
54 showmount_prog = find_program('showmount', required: false, dirs: libvirt_sbin_path)
55 showmount_path = ''
56--
572.17.1
58
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 \
30 file://gnutls-helper.py \ 30 file://gnutls-helper.py \
31 file://0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch \ 31 file://0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch \
32 file://0001-prevent-gendispatch.pl-generating-build-path-in-code.patch \ 32 file://0001-prevent-gendispatch.pl-generating-build-path-in-code.patch \
33 file://0001-messon.build-remove-build-path-information-to-avoid-.patch \
33 " 34 "
34 35
35SRC_URI[libvirt.sha256sum] = "3c6c43becffeb34a3f397c616206aa69a893ff8bf5e8208393c84e8e75352934" 36SRC_URI[libvirt.sha256sum] = "3c6c43becffeb34a3f397c616206aa69a893ff8bf5e8208393c84e8e75352934"