[meta-virtualization][PATCH V3] libvirt: fix installed-vs-shipped QA error

[meta-virtualization][PATCH V3] libvirt: fix installed-vs-shipped QA error

[Hongxu Jia]

In commit [1], upstream added sysusers config file for qemu & kvm user/groups,
the install dir is "install_dir: prefix / 'lib' / 'sysusers.d'".

In commit [2], Yocto created an empty file libvirt-qemu.conf to override
sysusers config file which is added by commit [1]

While usrmerge not in DISTRO_FEATURES, nonarch_base_libdir does not match
install_dir and trigger an installed-vs-shipped QA error
...
ERROR: QA Issue: libvirt: Files/directories were installed but not shipped in any package:
  /usr/lib/sysusers.d
  /usr/lib/sysusers.d/libvirt-qemu.conf
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
libvirt: 2 installed and not shipped files. [installed-vs-shipped]
...

Use nonarch_libdir to intead of nonarch_base_libdir to match the install dir
in commit [1]

[1] https://github.com/libvirt/libvirt/commit/a2c3e390f7bedf36f4ddc544d09fe3b8772c5c6f
[2] https://git.yoctoproject.org/meta-virtualization/commit/?id=8138d9cc7e0c31171230110db0cfa881c46a821b

Suggested-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 recipes-extended/libvirt/libvirt_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-extended/libvirt/libvirt_git.bb b/recipes-extended/libvirt/libvirt_git.bb
index 6a524977..b6f46722 100644
--- a/recipes-extended/libvirt/libvirt_git.bb
+++ b/recipes-extended/libvirt/libvirt_git.bb
@@ -95,7 +95,7 @@ FILES:${PN} += "${libdir}/libvirt/connection-driver \
 	    ${datadir}/bash-completion/completions/vsh \
 	    ${datadir}/bash-completion/completions/virt-admin \
 	    /usr/lib/firewalld/ \
-            ${nonarch_base_libdir}/sysusers.d/ \
+            ${nonarch_libdir}/sysusers.d/ \
 	    "
 
 FILES:${PN}-dbg += "${libdir}/libvirt/connection-driver/.debug ${libdir}/libvirt/lock-driver/.debug"
@@ -204,11 +204,11 @@ do_install:append() {
 	install -d ${D}/etc/init.d
 	install -d ${D}/etc/libvirt
 	install -d ${D}/etc/dnsmasq.d
-	install -d ${D}${nonarch_base_libdir}/sysusers.d/
+	install -d ${D}${nonarch_libdir}/sysusers.d/
 
 	install -m 0755 ${UNPACKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd
 	install -m 0644 ${UNPACKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf
-	install -m 0644 ${UNPACKDIR}/libvirt-qemu.conf ${D}${nonarch_base_libdir}/sysusers.d/libvirt-qemu.conf
+	install -m 0644 ${UNPACKDIR}/libvirt-qemu.conf ${D}${nonarch_libdir}/sysusers.d/libvirt-qemu.conf
 
 	if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
 	    # This will wind up in the libvirtd package, but will NOT be invoked by default.
-- 
2.34.1

Re: [meta-virtualization][PATCH V3] libvirt: fix installed-vs-shipped QA error

[Bruce Ashfield]

In message: [meta-virtualization][PATCH V3] libvirt: fix installed-vs-shipped QA error
on 10/02/2025 hongxu via lists.yoctoproject.org wrote:

> In commit [1], upstream added sysusers config file for qemu & kvm user/groups,
> the install dir is "install_dir: prefix / 'lib' / 'sysusers.d'".
> 
> In commit [2], Yocto created an empty file libvirt-qemu.conf to override
> sysusers config file which is added by commit [1]
> 
> While usrmerge not in DISTRO_FEATURES, nonarch_base_libdir does not match
> install_dir and trigger an installed-vs-shipped QA error
> ...
> ERROR: QA Issue: libvirt: Files/directories were installed but not shipped in any package:
>   /usr/lib/sysusers.d
>   /usr/lib/sysusers.d/libvirt-qemu.conf
> Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
> libvirt: 2 installed and not shipped files. [installed-vs-shipped]
> ...
> 
> Use nonarch_libdir to intead of nonarch_base_libdir to match the install dir
> in commit [1]

staged to master-next

Bruce

> 
> [1] https://github.com/libvirt/libvirt/commit/a2c3e390f7bedf36f4ddc544d09fe3b8772c5c6f
> [2] https://git.yoctoproject.org/meta-virtualization/commit/?id=8138d9cc7e0c31171230110db0cfa881c46a821b
> 
> Suggested-by: Chen Qi <Qi.Chen@windriver.com>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>  recipes-extended/libvirt/libvirt_git.bb | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/recipes-extended/libvirt/libvirt_git.bb b/recipes-extended/libvirt/libvirt_git.bb
> index 6a524977..b6f46722 100644
> --- a/recipes-extended/libvirt/libvirt_git.bb
> +++ b/recipes-extended/libvirt/libvirt_git.bb
> @@ -95,7 +95,7 @@ FILES:${PN} += "${libdir}/libvirt/connection-driver \
>  	    ${datadir}/bash-completion/completions/vsh \
>  	    ${datadir}/bash-completion/completions/virt-admin \
>  	    /usr/lib/firewalld/ \
> -            ${nonarch_base_libdir}/sysusers.d/ \
> +            ${nonarch_libdir}/sysusers.d/ \
>  	    "
>  
>  FILES:${PN}-dbg += "${libdir}/libvirt/connection-driver/.debug ${libdir}/libvirt/lock-driver/.debug"
> @@ -204,11 +204,11 @@ do_install:append() {
>  	install -d ${D}/etc/init.d
>  	install -d ${D}/etc/libvirt
>  	install -d ${D}/etc/dnsmasq.d
> -	install -d ${D}${nonarch_base_libdir}/sysusers.d/
> +	install -d ${D}${nonarch_libdir}/sysusers.d/
>  
>  	install -m 0755 ${UNPACKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd
>  	install -m 0644 ${UNPACKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf
> -	install -m 0644 ${UNPACKDIR}/libvirt-qemu.conf ${D}${nonarch_base_libdir}/sysusers.d/libvirt-qemu.conf
> +	install -m 0644 ${UNPACKDIR}/libvirt-qemu.conf ${D}${nonarch_libdir}/sysusers.d/libvirt-qemu.conf
>  
>  	if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
>  	    # This will wind up in the libvirtd package, but will NOT be invoked by default.
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9134): https://lists.yoctoproject.org/g/meta-virtualization/message/9134
> Mute This Topic: https://lists.yoctoproject.org/mt/111098897/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>