[meta-virtualization][PATCH] libvirt: ensure sysusers.d path for libvirt-qemu

[meta-virtualization][PATCH] libvirt: ensure sysusers.d path for libvirt-qemu

[tim.orling]

From: Tim Orling <tim.orling@konsulko.com>

In 8138d9cc7e0c31171230110db0cfa881c46a821b the path to
/lib/sysusers.d might not exist, use install -d to ensure
it does.

Fixes:
install: cannot create regular file
'.../libvirt/v10.5.0+git/image/lib/sysusers.d/libvirt-qemu.conf':
No such file or directory

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 recipes-extended/libvirt/libvirt_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/libvirt/libvirt_git.bb b/recipes-extended/libvirt/libvirt_git.bb
index 1175e737..bef98b69 100644
--- a/recipes-extended/libvirt/libvirt_git.bb
+++ b/recipes-extended/libvirt/libvirt_git.bb
@@ -208,7 +208,7 @@ do_install:append() {
 
 	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 -d -m 0644 ${UNPACKDIR}/libvirt-qemu.conf ${D}${nonarch_base_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.46.2

Re: [meta-virtualization][PATCH] libvirt: ensure sysusers.d path for libvirt-qemu

[Bruce Ashfield]

merged.

Bruce

In message: [meta-virtualization][PATCH] libvirt: ensure sysusers.d path for libvirt-qemu
on 28/09/2024 Tim Orling via lists.yoctoproject.org wrote:

> From: Tim Orling <tim.orling@konsulko.com>
> 
> In 8138d9cc7e0c31171230110db0cfa881c46a821b the path to
> /lib/sysusers.d might not exist, use install -d to ensure
> it does.
> 
> Fixes:
> install: cannot create regular file
> '.../libvirt/v10.5.0+git/image/lib/sysusers.d/libvirt-qemu.conf':
> No such file or directory
> 
> Signed-off-by: Tim Orling <tim.orling@konsulko.com>
> ---
>  recipes-extended/libvirt/libvirt_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-extended/libvirt/libvirt_git.bb b/recipes-extended/libvirt/libvirt_git.bb
> index 1175e737..bef98b69 100644
> --- a/recipes-extended/libvirt/libvirt_git.bb
> +++ b/recipes-extended/libvirt/libvirt_git.bb
> @@ -208,7 +208,7 @@ do_install:append() {
>  
>  	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 -d -m 0644 ${UNPACKDIR}/libvirt-qemu.conf ${D}${nonarch_base_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.46.2
> 

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

Re: [PATCH] libvirt: ensure sysusers.d path for libvirt-qemu

[Matthis Hauschild]

[-- Attachment #1: Type: text/plain, Size: 2405 bytes --]

Hi,

does that really solve your issue? With this patch applied, I run into the following build error because with the `-d` option, all arguments are treated as directories. So we should either use `-D` or create the directory accoring to the other created dirs in do_install

> 
> install: cannot create directory
> ‘/workdir/build/tmp/work/core2-64-wlanvm-linux/libvirt/v10.5.0+git/sources-unpack/libvirt-qemu.conf’:
> File exists
> install: cannot create directory
> ‘/workdir/build/tmp/work/core2-64-wlanvm-linux/libvirt/v10.5.0+git/image/usr/lib/sysusers.d/libvirt-qemu.conf’:
> File exists
> 

So I propose the following patch. Please let me know what you think.
Side note: This is my first contribution, I hope the format is correct, otherwise please let me know. I cannot use `git send-email`, so this is written from the webinterface.
Best regards,
Matthis

Patch:

3902ac8844a9868ab14fa38b663d3832daa4b9de leads to the following build
errors:
install: cannot create directory ‘{UNPACKDIR}/libvirt-qemu.conf’: File exists
install: cannot create directory ‘{D}/usr/lib/sysusers.d/libvirt-qemu.conf’: File exists
because `-d` treats all arguments as directories. Create the required
directory the same way as the other directories.
Signed-off-by: Matthis Hauschild <matthis.hauschild@airbus.com>
---
recipes-extended/libvirt/libvirt_git.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-extended/libvirt/libvirt_git.bb b/recipes-extended/libvirt/libvirt_git.bb
index bef98b69..5c5a9b3f 100644
--- a/recipes-extended/libvirt/libvirt_git.bb
+++ b/recipes-extended/libvirt/libvirt_git.bb
@@ -205,10 +205,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 -m 0755 ${UNPACKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd
install -m 0644 ${UNPACKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf
-    install -d -m 0644 ${UNPACKDIR}/libvirt-qemu.conf ${D}${nonarch_base_libdir}/sysusers.d/libvirt-qemu.conf
+    install -m 0644 ${UNPACKDIR}/libvirt-qemu.conf ${D}${nonarch_base_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.43.0

[-- Attachment #2: Type: text/html, Size: 2992 bytes --]

Re: [meta-virtualization] [PATCH] libvirt: ensure sysusers.d path for libvirt-qemu

[Bruce Ashfield]

On Wed, Oct 2, 2024 at 4:50 AM Matthis Hauschild via
lists.yoctoproject.org
<matthis.hauschild=airbus.com@lists.yoctoproject.org> wrote:
>
> Hi,
>
> does that really solve your issue? With this patch applied, I run into the following build error because with the `-d` option, all arguments are treated as directories. So we should either use `-D` or create the directory accoring to the other created dirs in do_install
>
>
> install: cannot create directory ‘/workdir/build/tmp/work/core2-64-wlanvm-linux/libvirt/v10.5.0+git/sources-unpack/libvirt-qemu.conf’: File exists
> install: cannot create directory ‘/workdir/build/tmp/work/core2-64-wlanvm-linux/libvirt/v10.5.0+git/image/usr/lib/sysusers.d/libvirt-qemu.conf’: File exists
>
> So I propose the following patch. Please let me know what you think.
> Side note: This is my first contribution, I hope the format is correct, otherwise please let me know. I cannot use `git send-email`, so this is written from the webinterface.
> Best regards,
> Matthis

This was my mistake, I had meant t push this to master-next, not master so
my test loop didn't trigger!

This should indeed match the format of the other directory installs, since the
combined command line is not universally supported.

The patch won't apply as it is in this email, but I'll make the change by hand
and add your information to the commit log.

Bruce

>
> Patch:
>
> 3902ac8844a9868ab14fa38b663d3832daa4b9de leads to the following build
> errors:
> install: cannot create directory ‘{UNPACKDIR}/libvirt-qemu.conf’: File exists
> install: cannot create directory ‘{D}/usr/lib/sysusers.d/libvirt-qemu.conf’: File exists
> because `-d` treats all arguments as directories. Create the required
> directory the same way as the other directories.
> Signed-off-by: Matthis Hauschild <matthis.hauschild@airbus.com>
> ---
>  recipes-extended/libvirt/libvirt_git.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> diff --git a/recipes-extended/libvirt/libvirt_git.bb b/recipes-extended/libvirt/libvirt_git.bb
> index bef98b69..5c5a9b3f 100644
> --- a/recipes-extended/libvirt/libvirt_git.bb
> +++ b/recipes-extended/libvirt/libvirt_git.bb
> @@ -205,10 +205,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 -m 0755 ${UNPACKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd
>      install -m 0644 ${UNPACKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf
> -    install -d -m 0644 ${UNPACKDIR}/libvirt-qemu.conf ${D}${nonarch_base_libdir}/sysusers.d/libvirt-qemu.conf
> +    install -m 0644 ${UNPACKDIR}/libvirt-qemu.conf ${D}${nonarch_base_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.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8908): https://lists.yoctoproject.org/g/meta-virtualization/message/8908
> Mute This Topic: https://lists.yoctoproject.org/mt/108714337/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Re: [meta-virtualization] [PATCH] libvirt: ensure sysusers.d path for libvirt-qemu

[Tim Orling]

[-- Attachment #1: Type: text/plain, Size: 4095 bytes --]

On Wed, Oct 2, 2024 at 6:15 AM Bruce Ashfield via lists.yoctoproject.org
<bruce.ashfield=gmail.com@lists.yoctoproject.org> wrote:

> On Wed, Oct 2, 2024 at 4:50 AM Matthis Hauschild via
> lists.yoctoproject.org
> <matthis.hauschild=airbus.com@lists.yoctoproject.org> wrote:
> >
> > Hi,
> >
> > does that really solve your issue? With this patch applied, I run into
> the following build error because with the `-d` option, all arguments are
> treated as directories. So we should either use `-D` or create the
> directory accoring to the other created dirs in do_install
> >
> >
> > install: cannot create directory
> ‘/workdir/build/tmp/work/core2-64-wlanvm-linux/libvirt/v10.5.0+git/sources-unpack/libvirt-qemu.conf’:
> File exists
> > install: cannot create directory
> ‘/workdir/build/tmp/work/core2-64-wlanvm-linux/libvirt/v10.5.0+git/image/usr/lib/sysusers.d/libvirt-qemu.conf’:
> File exists
> >
> > So I propose the following patch. Please let me know what you think.
> > Side note: This is my first contribution, I hope the format is correct,
> otherwise please let me know. I cannot use `git send-email`, so this is
> written from the webinterface.
> > Best regards,
> > Matthis
>
> This was my mistake, I had meant t push this to master-next, not master so
> my test loop didn't trigger!
>
> This should indeed match the format of the other directory installs, since
> the
> combined command line is not universally supported.
>
> The patch won't apply as it is in this email, but I'll make the change by
> hand
> and add your information to the commit log.


My bad as well. I didn’t test it well enough. Don’t send patches late at
night?

Thank you for the fix Matthias! LGTM

>
>
> Bruce
>
> >
> > Patch:
> >
> > 3902ac8844a9868ab14fa38b663d3832daa4b9de leads to the following build
> > errors:
> > install: cannot create directory ‘{UNPACKDIR}/libvirt-qemu.conf’: File
> exists
> > install: cannot create directory
> ‘{D}/usr/lib/sysusers.d/libvirt-qemu.conf’: File exists
> > because `-d` treats all arguments as directories. Create the required
> > directory the same way as the other directories.
> > Signed-off-by: Matthis Hauschild <matthis.hauschild@airbus.com>
> > ---
> >  recipes-extended/libvirt/libvirt_git.bb | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > diff --git a/recipes-extended/libvirt/libvirt_git.bb
> b/recipes-extended/libvirt/libvirt_git.bb
> > index bef98b69..5c5a9b3f 100644
> > --- a/recipes-extended/libvirt/libvirt_git.bb
> > +++ b/recipes-extended/libvirt/libvirt_git.bb
> > @@ -205,10 +205,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 -m 0755 ${UNPACKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd
> >      install -m 0644 ${UNPACKDIR}/libvirtd.conf
> ${D}/etc/libvirt/libvirtd.conf
> > -    install -d -m 0644 ${UNPACKDIR}/libvirt-qemu.conf
> ${D}${nonarch_base_libdir}/sysusers.d/libvirt-qemu.conf
> > +    install -m 0644 ${UNPACKDIR}/libvirt-qemu.conf
> ${D}${nonarch_base_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.43.0
> >
> >
> >
> >
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8909):
> https://lists.yoctoproject.org/g/meta-virtualization/message/8909
> Mute This Topic: https://lists.yoctoproject.org/mt/108714337/924729
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [
> ticotimo@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 6110 bytes --]