Date   

Re: [PATCH] libvirt: fix do_package issue

preeti.sachan@...
 

Hi Qi

You are right. My build configuration is also using multilib and this issue appeared.


Re: [PATCH] libvirt: fix do_package issue

Bruce Ashfield
 



On Mon, Apr 11, 2022 at 9:45 AM Chen, Qi <Qi.Chen@...> wrote:

The only package I found which uses /usr/lib/sysctl.d is systemd.

It packages ${exec_prefix}/lib/sysctl.d.

And it has its reason. It treats /usr/lib as an arch-independent vendor dir, and $libdir is treated as the dir to hold libs.

file-hierarchy (www.freedesktop.org)

 


Hmm.  Indeed. In that case, I'll go with a variant of the original patch, with a tweaked commit log. I'll take care of that now.

Bruce

 

Regards,

Qi

 

From: Bruce Ashfield <bruce.ashfield@...>
Sent: Monday, April 11, 2022 9:35 PM
To: Chen, Qi <Qi.Chen@...>
Cc: preeti.sachan@...; meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

 

 

On Mon, Apr 11, 2022 at 9:32 AM Chen, Qi <Qi.Chen@...> wrote:

Hi Bruce,

 

Looking at the issue a little further, I found we need to use the hardcoded ‘/usr/lib’.

This is because sysctl is hardcoding that.

 

That's a larger issue, and it breaks other parts of the system. We shouldn't have anything with hard coded /usr/lib.

 

How are other packages dealing with this ?

 

In that case, I'll do individual scripts in the packaging, since I don't want a global /usr/lib/ as part of the packaging.

 

Bruce

 

 

 

Some codes in sysctl.c from procps:

static int PreloadSystem(void)

{

        unsigned di, i;

        const char *dirs[] = {

                "/etc/sysctl.d",

                "/run/sysctl.d",

                "/usr/local/lib/sysctl.d",

                "/usr/lib/sysctl.d",

                "/lib/sysctl.d",

        };

 

I’ve sent out a patch to fix the issue. Please help review it.

 

Regards,

Qi

 

From: Bruce Ashfield <bruce.ashfield@...>
Sent: Monday, April 11, 2022 9:05 PM
To: Chen, Qi <Qi.Chen@...>
Cc: preeti.sachan@...; meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

 

 

On Mon, Apr 11, 2022 at 9:01 AM Chen, Qi <Qi.Chen@...> wrote:

Hi Bruce & Preeti,

 

I was trying to fix the same issue when I found this thread.

This issue appears when multilib is enabled.

 

When multilib is disabled, ${libdir} is /usr/lib, thus packaging the file into libvirt-python.

When multilib is enabled, ${libdir} is /usr/lib64, and the file is not packaged.

 

Aha. Right you are.

 

So we should tweak libvirt to use ${libdir} and not the hardcoded /user/lib (which it never really should have been), and package anything that gets installed into sysctl.d/

 

It isn't clear that this particular .conf belongs in libvirtd, but it is just as good there, as in the libvirt-python.

 

I'll do some tests in the non-multiconfig configuration to ensure that everything still packages properly.

 

Bruce

 

 

 

Regards,

Qi

 

From: meta-virtualization@... <meta-virtualization@...> On Behalf Of Bruce Ashfield
Sent: Monday, April 11, 2022 8:44 PM
To: preeti.sachan@...
Cc: meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

There's definitely something different in your configuration, so that needs to be understood first.

 

That file is packaged as part of libvirt-python here, and should be the same for others, as I haven't had any reports of failures.

 

You have a multiconfig in play. Anything else ? What is your init system ? Any bbappends in play ?

 

Bruce

 

On Sun, Apr 10, 2022 at 11:49 PM <preeti.sachan@...> wrote:

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: QA Issue: libvirt: Files/directories were installed but not shipped in any package:

  /usr/lib/sysctl.d/60-qemu-postcopy-migration.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: 1 installed and not shipped files. [installed-vs-shipped]

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: Fatal QA errors were found, failing task.

 


 

--

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


 

--

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


 

--

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



--
- 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: [PATCH] libvirt: fix do_package issue

Chen Qi
 

The only package I found which uses /usr/lib/sysctl.d is systemd.

It packages ${exec_prefix}/lib/sysctl.d.

And it has its reason. It treats /usr/lib as an arch-independent vendor dir, and $libdir is treated as the dir to hold libs.

file-hierarchy (www.freedesktop.org)

 

Regards,

Qi

 

From: Bruce Ashfield <bruce.ashfield@...>
Sent: Monday, April 11, 2022 9:35 PM
To: Chen, Qi <Qi.Chen@...>
Cc: preeti.sachan@...; meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

 

 

On Mon, Apr 11, 2022 at 9:32 AM Chen, Qi <Qi.Chen@...> wrote:

Hi Bruce,

 

Looking at the issue a little further, I found we need to use the hardcoded ‘/usr/lib’.

This is because sysctl is hardcoding that.

 

That's a larger issue, and it breaks other parts of the system. We shouldn't have anything with hard coded /usr/lib.

 

How are other packages dealing with this ?

 

In that case, I'll do individual scripts in the packaging, since I don't want a global /usr/lib/ as part of the packaging.

 

Bruce

 

 

 

Some codes in sysctl.c from procps:

static int PreloadSystem(void)

{

        unsigned di, i;

        const char *dirs[] = {

                "/etc/sysctl.d",

                "/run/sysctl.d",

                "/usr/local/lib/sysctl.d",

                "/usr/lib/sysctl.d",

                "/lib/sysctl.d",

        };

 

I’ve sent out a patch to fix the issue. Please help review it.

 

Regards,

Qi

 

From: Bruce Ashfield <bruce.ashfield@...>
Sent: Monday, April 11, 2022 9:05 PM
To: Chen, Qi <Qi.Chen@...>
Cc: preeti.sachan@...; meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

 

 

On Mon, Apr 11, 2022 at 9:01 AM Chen, Qi <Qi.Chen@...> wrote:

Hi Bruce & Preeti,

 

I was trying to fix the same issue when I found this thread.

This issue appears when multilib is enabled.

 

When multilib is disabled, ${libdir} is /usr/lib, thus packaging the file into libvirt-python.

When multilib is enabled, ${libdir} is /usr/lib64, and the file is not packaged.

 

Aha. Right you are.

 

So we should tweak libvirt to use ${libdir} and not the hardcoded /user/lib (which it never really should have been), and package anything that gets installed into sysctl.d/

 

It isn't clear that this particular .conf belongs in libvirtd, but it is just as good there, as in the libvirt-python.

 

I'll do some tests in the non-multiconfig configuration to ensure that everything still packages properly.

 

Bruce

 

 

 

Regards,

Qi

 

From: meta-virtualization@... <meta-virtualization@...> On Behalf Of Bruce Ashfield
Sent: Monday, April 11, 2022 8:44 PM
To: preeti.sachan@...
Cc: meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

There's definitely something different in your configuration, so that needs to be understood first.

 

That file is packaged as part of libvirt-python here, and should be the same for others, as I haven't had any reports of failures.

 

You have a multiconfig in play. Anything else ? What is your init system ? Any bbappends in play ?

 

Bruce

 

On Sun, Apr 10, 2022 at 11:49 PM <preeti.sachan@...> wrote:

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: QA Issue: libvirt: Files/directories were installed but not shipped in any package:

  /usr/lib/sysctl.d/60-qemu-postcopy-migration.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: 1 installed and not shipped files. [installed-vs-shipped]

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: Fatal QA errors were found, failing task.

 


 

--

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


 

--

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


 

--

- 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: [PATCH] k3s: do not use a go file as patch

Bruce Ashfield
 



On Fri, Apr 8, 2022 at 1:42 PM Bruce Ashfield via lists.yoctoproject.org <bruce.ashfield=gmail.com@...> wrote:


On Fri, Apr 8, 2022 at 1:31 PM Adrian Freihofer <adrian.freihofer@...> wrote:
Hi Bruce

Build with empty download folder works:
  bitbake k3s -c cleanall
  (cd downloads; find -name \*andreyvit\* -delete )
  bitbake k3s

My download folder looks like that after building K3S
downloads]$ find -name \*andreyvit\*
./git2/github.com.andreyvit.diff
./git2/github.com.andreyvit.diff.done
./gitshallow_github.com.andreyvit.diff_c7f18ee-1.tar.gz
./gitshallow_github.com.andreyvit.diff_c7f18ee-1.tar.gz.done


This does not work:
  bitbake k3s -c cleanall

  downloads]$ find -name \*andreyvit\*
  ./gitshallow_github.com.andreyvit.diff_c7f18ee-1.tar.gz
  ./gitshallow_github.com.andreyvit.diff_c7f18ee-1.tar.gz.done

  bitbake k3s
  ERROR: k3s-v1.22.6+k3s1+git4262c6b91a43ef8411870f72ff8b8715949f90e2-
  r0 do_patch: Importing patch 'github.com.andreyvit.diff' with 
  striplevel '1' FileNotFoundError(2, 'No such file or directory')

Conclusion: After bitbake k3s -c cleanall the error occurs.


I'll see if I see the same behaviour, as i've done a LOT of cleanalls as I battled the uprev of k3s, and didn't see that. But it could have been hidden in a fail -> restart cycle as things moved past the issue.

I've done multiple executions of that exact set of steps, and I've never seen the error you are encountering. Clearly there's something different in the various build environments.

We are also getting reports of k3s working in other CI setups and runtime success, so it also isn't happening everywhere.

That being said, the patch is simple enough, and as long as it doesn't break my tests (re-running with it queued now), I'll merge it and just keep an eye out for other similar behaviour popping up.

Bruce

 


I also spent some time to analyze what the function "patch_path" in
patch.py does: It matches ".diff" against "github.com.andreyvit.diff".

Indeed, I suppose something could be done to allow that repo to have that name, and not be picked up as a patch, but it isn't a common problem, so the complexity wouldn't really be worth it.

Once i've reproduced the issue, i'll test with your patch, as it is the simplest way to avoid the problem.

Bruce

 

Regards,
Adrian


On Fri, 2022-04-08 at 10:29 -0400, Bruce Ashfield wrote:
>
>
> On Fri, Apr 8, 2022 at 8:53 AM Bruce Ashfield via
> lists.yoctoproject.org
> <bruce.ashfield=gmail.com@...> wrote:
> >
> >
> > On Fri, Apr 8, 2022 at 8:34 AM Adrian Freihofer
> > <adrian.freihofer@...> wrote:
> > > Compiling k3s failed with:
> > > do_patch: Importing patch 'github.com.andreyvit.diff' with
> > > striplevel '1'
> > >
> > > The problem is that github.com/andreyvit/diff ends up as
> > > github.com.andreyvit.diff
> > > in the download folder which than matches the test in patch.py.
> > >
> > >
> >
> >
> > I've built this K3S hundreds of times, and have never seen this, so
> > I won't apply this until I figure out what is the difference
> > between your environment and mine.
> >
> > Can you share more details about your build environment, etc.
> >
>
>
> I am seeing a different fetch issue on a new/fresh machine I brought
> up this morning, using the -tip of master for all layers. My
> cached downloads were keeping it working on my other machines.
>
> I'll get past that issue and see if I get the patch issue.
>
> Cheers,
>
> Bruce
>
>
>  
> >
> >  
> > > Not sure how you create this huge SRC_URI list. Probably it would
> > > be the
> > > best to add the apply=no to all urls.
> > >
> > >
> >
> >
> > Eh, no. I'm not going to append that to all the URIs just because
> > of one outlier that matched.
> >
> > Bruce
> >
> >  
> > > Signed-off-by: Adrian Freihofer <adrian.freihofer@...>
> > > ---
> > >  recipes-containers/k3s/k3s_git.bb | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-
> > > containers/k3s/k3s_git.bb
> > > index e2a3ffc..53a8677 100644
> > > --- a/recipes-containers/k3s/k3s_git.bb
> > > +++ b/recipes-containers/k3s/k3s_git.bb
> > > @@ -219,7 +219,7 @@ SRC_URI += "git://github.com/alexflint/go-
> > > filemutex;name=go-filemutex;protocol=h
> > >  # github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
> > >  # [1] git ls-remote https://github.com/andreyvit/diff
> > > c7f18ee00883bfd3b00e0a2bf7607827e0148ad4
> > >  SRCREV_diff="c7f18ee00883bfd3b00e0a2bf7607827e0148ad4"
> > > -SRC_URI +=
> > > "git://github.com/andreyvit/diff;name=diff;protocol=https;nobranc
> > > h=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.co
> > > m/andreyvit/diff"
> > > +SRC_URI +=
> > > "git://github.com/andreyvit/diff;name=diff;protocol=https;nobranc
> > > h=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.co
> > > m/andreyvit/diff;apply=no"
> > >
> > >  # github.com/andybalholm/cascadia v1.0.0
> > >  # [1] git ls-remote https://github.com/andybalholm/cascadia
> > > 901648c87902174f774fac311d7f176f8647bdaa
> > > --
> > > 2.35.1
> > >
> > >
> > >
> > >
> >
> >
> > --
> > - Thou shalt not follow the NULL pointer, for chaos and madness
> > await thee at its end
> > - "Use the force Harry" - Gandalf, Star Trek II
> >
> >
> >
> >
>
>



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






--
- 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: [PATCH] libvirt: fix do_package issue

Bruce Ashfield
 



On Mon, Apr 11, 2022 at 9:32 AM Chen, Qi <Qi.Chen@...> wrote:

Hi Bruce,

 

Looking at the issue a little further, I found we need to use the hardcoded ‘/usr/lib’.

This is because sysctl is hardcoding that.


That's a larger issue, and it breaks other parts of the system. We shouldn't have anything with hard coded /usr/lib.

How are other packages dealing with this ?

In that case, I'll do individual scripts in the packaging, since I don't want a global /usr/lib/ as part of the packaging.

Bruce

 

 

Some codes in sysctl.c from procps:

static int PreloadSystem(void)

{

        unsigned di, i;

        const char *dirs[] = {

                "/etc/sysctl.d",

                "/run/sysctl.d",

                "/usr/local/lib/sysctl.d",

                "/usr/lib/sysctl.d",

                "/lib/sysctl.d",

        };

 

I’ve sent out a patch to fix the issue. Please help review it.

 

Regards,

Qi

 

From: Bruce Ashfield <bruce.ashfield@...>
Sent: Monday, April 11, 2022 9:05 PM
To: Chen, Qi <Qi.Chen@...>
Cc: preeti.sachan@...; meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

 

 

On Mon, Apr 11, 2022 at 9:01 AM Chen, Qi <Qi.Chen@...> wrote:

Hi Bruce & Preeti,

 

I was trying to fix the same issue when I found this thread.

This issue appears when multilib is enabled.

 

When multilib is disabled, ${libdir} is /usr/lib, thus packaging the file into libvirt-python.

When multilib is enabled, ${libdir} is /usr/lib64, and the file is not packaged.

 

Aha. Right you are.

 

So we should tweak libvirt to use ${libdir} and not the hardcoded /user/lib (which it never really should have been), and package anything that gets installed into sysctl.d/

 

It isn't clear that this particular .conf belongs in libvirtd, but it is just as good there, as in the libvirt-python.

 

I'll do some tests in the non-multiconfig configuration to ensure that everything still packages properly.

 

Bruce

 

 

 

Regards,

Qi

 

From: meta-virtualization@... <meta-virtualization@...> On Behalf Of Bruce Ashfield
Sent: Monday, April 11, 2022 8:44 PM
To: preeti.sachan@...
Cc: meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

There's definitely something different in your configuration, so that needs to be understood first.

 

That file is packaged as part of libvirt-python here, and should be the same for others, as I haven't had any reports of failures.

 

You have a multiconfig in play. Anything else ? What is your init system ? Any bbappends in play ?

 

Bruce

 

On Sun, Apr 10, 2022 at 11:49 PM <preeti.sachan@...> wrote:

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: QA Issue: libvirt: Files/directories were installed but not shipped in any package:

  /usr/lib/sysctl.d/60-qemu-postcopy-migration.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: 1 installed and not shipped files. [installed-vs-shipped]

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: Fatal QA errors were found, failing task.

 


 

--

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


 

--

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



--
- 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: [PATCH] libvirt: package all sysctl conf files for libvirtd

Bruce Ashfield
 



On Mon, Apr 11, 2022 at 9:29 AM Chen Qi <Qi.Chen@...> wrote:
The libvirtd package has already packaged ${sysconfdir}/sysctl.d,
and also the /usr/lib/sysctl.d/60-libvirtd.conf, it would be
reasonable for it to package other sysctl conf files, otherwise
we will meet the following error in case of multilib.

  QA Issue: libvirt: Files/directories were installed but not shipped in any package:
    /usr/lib/sysctl.d/60-qemu-postcopy-migration.conf

See the patch that I sent as well.

There's no reason to have /usr/lib anywhere in the packaging at all. We should just rely on ${libdir}, if libvirt is installing outside of the definition of ${libdir}, then we can patch ilbvirt, versus hardcoding /usr/lib in the FILES variables.

Bruce

 

Signed-off-by: Chen Qi <Qi.Chen@...>
---
 recipes-extended/libvirt/libvirt_8.1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/libvirt/libvirt_8.1.0.bb b/recipes-extended/libvirt/libvirt_8.1.0.bb
index b90fb704..433601c6 100644
--- a/recipes-extended/libvirt/libvirt_8.1.0.bb
+++ b/recipes-extended/libvirt/libvirt_8.1.0.bb
@@ -62,7 +62,7 @@ FILES:${PN}-libvirtd = " \
        ${sysconfdir}/sysctl.d \
        ${sysconfdir}/logrotate.d \
        ${sysconfdir}/libvirt/libvirtd.conf \
-        /usr/lib/sysctl.d/60-libvirtd.conf \
+        /usr/lib/sysctl.d/ \
        ${sbindir}/libvirtd \
        ${systemd_system_unitdir} \
        ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \
--
2.33.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


Re: [PATCH] libvirt: fix do_package issue

Chen Qi
 

Hi Bruce,

 

Looking at the issue a little further, I found we need to use the hardcoded ‘/usr/lib’.

This is because sysctl is hardcoding that.

 

Some codes in sysctl.c from procps:

static int PreloadSystem(void)

{

        unsigned di, i;

        const char *dirs[] = {

                "/etc/sysctl.d",

                "/run/sysctl.d",

                "/usr/local/lib/sysctl.d",

                "/usr/lib/sysctl.d",

                "/lib/sysctl.d",

        };

 

I’ve sent out a patch to fix the issue. Please help review it.

 

Regards,

Qi

 

From: Bruce Ashfield <bruce.ashfield@...>
Sent: Monday, April 11, 2022 9:05 PM
To: Chen, Qi <Qi.Chen@...>
Cc: preeti.sachan@...; meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

 

 

On Mon, Apr 11, 2022 at 9:01 AM Chen, Qi <Qi.Chen@...> wrote:

Hi Bruce & Preeti,

 

I was trying to fix the same issue when I found this thread.

This issue appears when multilib is enabled.

 

When multilib is disabled, ${libdir} is /usr/lib, thus packaging the file into libvirt-python.

When multilib is enabled, ${libdir} is /usr/lib64, and the file is not packaged.

 

Aha. Right you are.

 

So we should tweak libvirt to use ${libdir} and not the hardcoded /user/lib (which it never really should have been), and package anything that gets installed into sysctl.d/

 

It isn't clear that this particular .conf belongs in libvirtd, but it is just as good there, as in the libvirt-python.

 

I'll do some tests in the non-multiconfig configuration to ensure that everything still packages properly.

 

Bruce

 

 

 

Regards,

Qi

 

From: meta-virtualization@... <meta-virtualization@...> On Behalf Of Bruce Ashfield
Sent: Monday, April 11, 2022 8:44 PM
To: preeti.sachan@...
Cc: meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

There's definitely something different in your configuration, so that needs to be understood first.

 

That file is packaged as part of libvirt-python here, and should be the same for others, as I haven't had any reports of failures.

 

You have a multiconfig in play. Anything else ? What is your init system ? Any bbappends in play ?

 

Bruce

 

On Sun, Apr 10, 2022 at 11:49 PM <preeti.sachan@...> wrote:

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: QA Issue: libvirt: Files/directories were installed but not shipped in any package:

  /usr/lib/sysctl.d/60-qemu-postcopy-migration.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: 1 installed and not shipped files. [installed-vs-shipped]

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: Fatal QA errors were found, failing task.

 


 

--

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


 

--

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


[PATCH] libvirt: package all sysctl conf files for libvirtd

Chen Qi
 

The libvirtd package has already packaged ${sysconfdir}/sysctl.d,
and also the /usr/lib/sysctl.d/60-libvirtd.conf, it would be
reasonable for it to package other sysctl conf files, otherwise
we will meet the following error in case of multilib.

QA Issue: libvirt: Files/directories were installed but not shipped in any package:
/usr/lib/sysctl.d/60-qemu-postcopy-migration.conf

Signed-off-by: Chen Qi <Qi.Chen@...>
---
recipes-extended/libvirt/libvirt_8.1.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/libvirt/libvirt_8.1.0.bb b/recipes-extended/libvirt/libvirt_8.1.0.bb
index b90fb704..433601c6 100644
--- a/recipes-extended/libvirt/libvirt_8.1.0.bb
+++ b/recipes-extended/libvirt/libvirt_8.1.0.bb
@@ -62,7 +62,7 @@ FILES:${PN}-libvirtd = " \
${sysconfdir}/sysctl.d \
${sysconfdir}/logrotate.d \
${sysconfdir}/libvirt/libvirtd.conf \
- /usr/lib/sysctl.d/60-libvirtd.conf \
+ /usr/lib/sysctl.d/ \
${sbindir}/libvirtd \
${systemd_system_unitdir} \
${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \
--
2.33.0


Re: [PATCH] libvirt: fix do_package issue

Bruce Ashfield
 



On Mon, Apr 11, 2022 at 9:05 AM Bruce Ashfield via lists.yoctoproject.org <bruce.ashfield=gmail.com@...> wrote:


On Mon, Apr 11, 2022 at 9:01 AM Chen, Qi <Qi.Chen@...> wrote:

Hi Bruce & Preeti,

 

I was trying to fix the same issue when I found this thread.

This issue appears when multilib is enabled.

 

When multilib is disabled, ${libdir} is /usr/lib, thus packaging the file into libvirt-python.

When multilib is enabled, ${libdir} is /usr/lib64, and the file is not packaged.


Aha. Right you are.

So we should tweak libvirt to use ${libdir} and not the hardcoded /user/lib (which it never really should have been), and package anything that gets installed into sysctl.d/

It isn't clear that this particular .conf belongs in libvirtd, but it is just as good there, as in the libvirt-python.

I'll do some tests in the non-multiconfig configuration to ensure that everything still packages properly.

 

Bruce

 

 

Regards,

Qi

 

From: meta-virtualization@... <meta-virtualization@...> On Behalf Of Bruce Ashfield
Sent: Monday, April 11, 2022 8:44 PM
To: preeti.sachan@...
Cc: meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

There's definitely something different in your configuration, so that needs to be understood first.

 

That file is packaged as part of libvirt-python here, and should be the same for others, as I haven't had any reports of failures.

 

You have a multiconfig in play. Anything else ? What is your init system ? Any bbappends in play ?

 

Bruce

 

On Sun, Apr 10, 2022 at 11:49 PM <preeti.sachan@...> wrote:

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: QA Issue: libvirt: Files/directories were installed but not shipped in any package:

  /usr/lib/sysctl.d/60-qemu-postcopy-migration.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: 1 installed and not shipped files. [installed-vs-shipped]

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: Fatal QA errors were found, failing task.




 

--

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



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






--
- 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: [PATCH] libvirt: fix do_package issue

Bruce Ashfield
 



On Mon, Apr 11, 2022 at 9:01 AM Chen, Qi <Qi.Chen@...> wrote:

Hi Bruce & Preeti,

 

I was trying to fix the same issue when I found this thread.

This issue appears when multilib is enabled.

 

When multilib is disabled, ${libdir} is /usr/lib, thus packaging the file into libvirt-python.

When multilib is enabled, ${libdir} is /usr/lib64, and the file is not packaged.


Aha. Right you are.

So we should tweak libvirt to use ${libdir} and not the hardcoded /user/lib (which it never really should have been), and package anything that gets installed into sysctl.d/

It isn't clear that this particular .conf belongs in libvirtd, but it is just as good there, as in the libvirt-python.

I'll do some tests in the non-multiconfig configuration to ensure that everything still packages properly.

Bruce

 

 

Regards,

Qi

 

From: meta-virtualization@... <meta-virtualization@...> On Behalf Of Bruce Ashfield
Sent: Monday, April 11, 2022 8:44 PM
To: preeti.sachan@...
Cc: meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

There's definitely something different in your configuration, so that needs to be understood first.

 

That file is packaged as part of libvirt-python here, and should be the same for others, as I haven't had any reports of failures.

 

You have a multiconfig in play. Anything else ? What is your init system ? Any bbappends in play ?

 

Bruce

 

On Sun, Apr 10, 2022 at 11:49 PM <preeti.sachan@...> wrote:

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: QA Issue: libvirt: Files/directories were installed but not shipped in any package:

  /usr/lib/sysctl.d/60-qemu-postcopy-migration.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: 1 installed and not shipped files. [installed-vs-shipped]

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: Fatal QA errors were found, failing task.




 

--

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



--
- 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: [PATCH] libvirt: fix do_package issue

Chen Qi
 

Hi Bruce & Preeti,

 

I was trying to fix the same issue when I found this thread.

This issue appears when multilib is enabled.

 

When multilib is disabled, ${libdir} is /usr/lib, thus packaging the file into libvirt-python.

When multilib is enabled, ${libdir} is /usr/lib64, and the file is not packaged.

 

Regards,

Qi

 

From: meta-virtualization@... <meta-virtualization@...> On Behalf Of Bruce Ashfield
Sent: Monday, April 11, 2022 8:44 PM
To: preeti.sachan@...
Cc: meta-virtualization@...
Subject: Re: [meta-virtualization] [PATCH] libvirt: fix do_package issue

 

There's definitely something different in your configuration, so that needs to be understood first.

 

That file is packaged as part of libvirt-python here, and should be the same for others, as I haven't had any reports of failures.

 

You have a multiconfig in play. Anything else ? What is your init system ? Any bbappends in play ?

 

Bruce

 

On Sun, Apr 10, 2022 at 11:49 PM <preeti.sachan@...> wrote:

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: QA Issue: libvirt: Files/directories were installed but not shipped in any package:

  /usr/lib/sysctl.d/60-qemu-postcopy-migration.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: 1 installed and not shipped files. [installed-vs-shipped]

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: Fatal QA errors were found, failing task.




 

--

- 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: [PATCH] libvirt: fix do_package issue

preeti.sachan@...
 

No libvirt bbappend file in build and multiconfig is created to build with particular kernel version. 
In recipe https://git.yoctoproject.org/meta-virtualization/tree/recipes-extended/libvirt/libvirt_8.1.0.bb , FILES:${PN}-libvirtd is not including  "/usr/lib/sysctl.d/60-qemu-postcopy-migration.conf " neither something "usr/lib/sysctl.d/*". It's strange how it is packaging file "/usr/lib/sysctl.d/60-qemu-postcopy-migration.conf "


Re: [PATCH] libvirt: fix do_package issue

Bruce Ashfield
 

There's definitely something different in your configuration, so that needs to be understood first.

That file is packaged as part of libvirt-python here, and should be the same for others, as I haven't had any reports of failures.

You have a multiconfig in play. Anything else ? What is your init system ? Any bbappends in play ?

Bruce

On Sun, Apr 10, 2022 at 11:49 PM <preeti.sachan@...> wrote:
ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: QA Issue: libvirt: Files/directories were installed but not shipped in any package:
  /usr/lib/sysctl.d/60-qemu-postcopy-migration.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: 1 installed and not shipped files. [installed-vs-shipped]
ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: Fatal QA errors were found, failing task.





--
- 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: [PATCH] cni: Add ;protocol=https for flannel_plugin SRC_URI

Bruce Ashfield
 



On Mon, Apr 11, 2022 at 6:45 AM Diego Sueiro <diego.sueiro@...> wrote:
Also, fix the indentation for the SRC_URI variable assignment.


It had a protocol specification already, I just managed to miss an 'o'. I've fixed that, and pushed the change.

Annoying that github didn't break/stop my build immediately with that typo, but at least it is fixed now

Bruce

 
Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
 recipes-networking/cni/cni_git.bb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index 42eed1b..9248af2 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -15,10 +15,11 @@ SRCREV_plugins = "b8a10bbe111e9db72433f357c37077554ada7ca1"
 SRCREV_flannel_plugin = "076c4462d6c6887614fc881b806b690b9e56ceb2"
 SRCREV_FORMAT = "cni_plugins"
 SRC_URI = "\
-       git://github.com/containernetworking/cni.git;nobranch=1;name=cni;protocol=https \
-        git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https \
-        git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protcol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel \
-       "
+    git://github.com/containernetworking/cni.git;nobranch=1;name=cni;protocol=https \
+    git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https \
+    git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protcol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel;protocol=https \
+    "
+
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"

--
2.35.1






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


[PATCH] cni: Add ;protocol=https for flannel_plugin SRC_URI

Diego Sueiro
 

Also, fix the indentation for the SRC_URI variable assignment.

Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
recipes-networking/cni/cni_git.bb | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/c=
ni_git.bb
index 42eed1b..9248af2 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -15,10 +15,11 @@ SRCREV_plugins =3D "b8a10bbe111e9db72433f357c37077554=
ada7ca1"
SRCREV_flannel_plugin =3D "076c4462d6c6887614fc881b806b690b9e56ceb2"
SRCREV_FORMAT =3D "cni_plugins"
SRC_URI =3D "\
- git://github.com/containernetworking/cni.git;nobranch=3D1;name=3Dcni;pr=
otocol=3Dhttps \
- git://github.com/containernetworking/plugins.git;nobranch=3D1;de=
stsuffix=3D${S}/src/github.com/containernetworking/plugins;name=3Dplugins=
;protocol=3Dhttps \
- git://github.com/flannel-io/cni-plugin;branch=3Dmain;name=3Dflan=
nel_plugin;protcol=3Dhttps;destsuffix=3D${S}/src/github.com/containernetw=
orking/plugins/plugins/meta/flannel \
- "
+ git://github.com/containernetworking/cni.git;nobranch=3D1;name=3Dcni=
;protocol=3Dhttps \
+ git://github.com/containernetworking/plugins.git;nobranch=3D1;destsu=
ffix=3D${S}/src/github.com/containernetworking/plugins;name=3Dplugins;pro=
tocol=3Dhttps \
+ git://github.com/flannel-io/cni-plugin;branch=3Dmain;name=3Dflannel_=
plugin;protcol=3Dhttps;destsuffix=3D${S}/src/github.com/containernetworki=
ng/plugins/plugins/meta/flannel;protocol=3Dhttps \
+ "
+
LICENSE =3D "Apache-2.0"
LIC_FILES_CHKSUM =3D "file://src/import/LICENSE;md5=3Dfa818a259cbed7ce8b=
c2a22d35a464fc"
=20
--=20
2.35.1


Re: [PATCH 0/3] xen: Update recipes for xen and xen-tools

Bertrand Marquis
 

Hi Michal,

On 8 Apr 2022, at 09:44, Michal Orzel via lists.yoctoproject.org <michal.orzel=arm.com@...> wrote:

Before the next Yocto release, Xen recipes need to be updated.
This patch series:
- updates 4.15 recipes
- introduces 4.16 recipes
- removes 4.14 recipes
Thanks a lot for this.

For the whole serie:
Reviewed-by: Bertrand Marquis <bertrand.marquis@...>

Cheers
Bertrand


Michal Orzel (3):
xen: Bump SRCREV of 4.15 recipes to 4.15.2
xen: Add recipes for stable Xen 4.16 release and update master
xen: Remove 4.14 recipes and related patches

.../include/meta-virt-default-versions.inc | 4 +-
...-stand-alone-set-of-headers-Xen-4.14.patch | 178 ------------------
...ython-pygrub-pass-DISTUTILS-xen-4.14.patch | 66 -------
...d-firmware-as-ffreestanding-Xen-4.14.patch | 83 --------
recipes-extended/xen/xen-tools_4.14.bb | 21 ---
recipes-extended/xen/xen-tools_4.15.bb | 4 +-
recipes-extended/xen/xen-tools_4.16.bb | 19 ++
recipes-extended/xen/xen-tools_git.bb | 6 +-
recipes-extended/xen/xen_4.15.bb | 4 +-
.../xen/{xen_4.14.bb => xen_4.16.bb} | 6 +-
recipes-extended/xen/xen_git.bb | 6 +-
11 files changed, 34 insertions(+), 363 deletions(-)
delete mode 100644 recipes-extended/xen/files/0001-firmware-provide-a-stand-alone-set-of-headers-Xen-4.14.patch
delete mode 100644 recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch
delete mode 100644 recipes-extended/xen/files/0001-tools-firmware-Build-firmware-as-ffreestanding-Xen-4.14.patch
delete mode 100644 recipes-extended/xen/xen-tools_4.14.bb
create mode 100644 recipes-extended/xen/xen-tools_4.16.bb
rename recipes-extended/xen/{xen_4.14.bb => xen_4.16.bb} (79%)

--
2.25.1




Re: [PATCH] libvirt: fix do_package issue

preeti.sachan@...
 

ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: QA Issue: libvirt: Files/directories were installed but not shipped in any package:
  /usr/lib/sysctl.d/60-qemu-postcopy-migration.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: 1 installed and not shipped files. [installed-vs-shipped]
ERROR: mc:x86-2020:libvirt-8.1.0-r0 do_package: Fatal QA errors were found, failing task.


Re: [PATCH] libvirt: fix do_package issue

Bruce Ashfield
 

I'm not seeing any packaging issues here.

Can you elaborate on what warning/QA/other issue you are seeing ?

Bruce

On Sun, Apr 10, 2022 at 8:38 PM <preeti.sachan@...> wrote:
From: Preeti Sachan <preeti.sachan@...>

Signed-off-by: Preeti Sachan <preeti.sachan@...>
---
 recipes-extended/libvirt/libvirt_8.1.0.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-extended/libvirt/libvirt_8.1.0.bb b/recipes-extended/libvirt/libvirt_8.1.0.bb
index b90fb70..712cea8 100644
--- a/recipes-extended/libvirt/libvirt_8.1.0.bb
+++ b/recipes-extended/libvirt/libvirt_8.1.0.bb
@@ -63,6 +63,7 @@ FILES:${PN}-libvirtd = " \
        ${sysconfdir}/logrotate.d \
        ${sysconfdir}/libvirt/libvirtd.conf \
         /usr/lib/sysctl.d/60-libvirtd.conf \
+        /usr/lib/sysctl.d/60-qemu-postcopy-migration.conf \
        ${sbindir}/libvirtd \
        ${systemd_system_unitdir} \
        ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \
--
2.25.1






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


[PATCH] libvirt: fix do_package issue

preeti.sachan@...
 

From: Preeti Sachan <preeti.sachan@...>

Signed-off-by: Preeti Sachan <preeti.sachan@...>
---
recipes-extended/libvirt/libvirt_8.1.0.bb | 1 +
1 file changed, 1 insertion(+)

diff --git a/recipes-extended/libvirt/libvirt_8.1.0.bb b/recipes-extended/libvirt/libvirt_8.1.0.bb
index b90fb70..712cea8 100644
--- a/recipes-extended/libvirt/libvirt_8.1.0.bb
+++ b/recipes-extended/libvirt/libvirt_8.1.0.bb
@@ -63,6 +63,7 @@ FILES:${PN}-libvirtd = " \
${sysconfdir}/logrotate.d \
${sysconfdir}/libvirt/libvirtd.conf \
/usr/lib/sysctl.d/60-libvirtd.conf \
+ /usr/lib/sysctl.d/60-qemu-postcopy-migration.conf \
${sbindir}/libvirtd \
${systemd_system_unitdir} \
${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \
--
2.25.1


Re: Issues with k3s runtime on master

Bruce Ashfield
 



On Fri, Apr 8, 2022 at 2:06 PM Diego Sueiro <Diego.Sueiro@...> wrote:

 

From: Bruce Ashfield <bruce.ashfield@...>
Sent: 08 April 2022 18:39
To: Bruce Ashfield <bruce.ashfield@...>
Cc: Diego Sueiro <Diego.Sueiro@...>; meta-virtualization@...; Richard Neill <Richard.Neill@...>; nd <nd@...>
Subject: Re: [meta-virtualization] Issues with k3s runtime on master

 

 

 

On Fri, Apr 8, 2022 at 1:04 PM Bruce Ashfield via lists.yoctoproject.org <bruce.ashfield=gmail.com@...> wrote:

 

 

On Fri, Apr 8, 2022 at 12:54 PM Diego Sueiro <Diego.Sueiro@...> wrote:

Hi Bruce,

 

I'm having k3s runtime issues where during the k3s.service start I'm getting error messages about missing /usr/libexec/cni/flannel.

 

I saw that the cni_git.bb recipe was bumped to versions where flannel and its plugin are not available anymore.

 

In this case, should we have a recipe to provide both flannel and its plugin?

 

 

 

Yep. I don't use flannel, so it wasn't something that I had done. That being said, I wanted to avoid maintaining separate recipes per-plugin, so when the need arose, I was going to add it to cni_git as an entry on the SRC_URI.

 

I can have a go at doing that, now that I know there is a need.

 

FYI: Here's the WIP change: https://git.yoctoproject.org/meta-virtualization/commit/?h=master-next&id=589391db2777f844577a3805fa475515fe62c99f

 

I can confirm that the k3s runtime is working with this change.

Should we have SRCREV_FORMAT = "cni_plugins_flannel_plugin" as well as adding ;protocol=https into the SRC_URI?


It isn't strictly required. There's so many entries in the SRC_URI for some packages, we can't really list them all, and have the SRCREV format be useful at all.

Bruce

 

 

Bruce

 

 

 

Bruce

 

--

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



 

--

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



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