Date   

Re: [hardknott][PATCH V2] containerd-opencontainers: bump to v1.4.13

Bruce Ashfield
 

merged.

Bruce

In message: [meta-virtualization][hardknott][PATCH V2] containerd-opencontainers: bump to v1.4.13
on 15/04/2022 Chen Qi wrote:

Bump from v1.4.12 to v.1.4.13, which solves CVE-2022-23648.

Signed-off-by: Chen Qi <Qi.Chen@...>
---
.../containerd/containerd-opencontainers_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index 7f6c75d9..40b03163 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and
support as well as checkpoint and restore for cloning and live migration of containers."


-SRCREV = "7b11cfaabd73bb80907dd23182b9347b4245eb5d"
+SRCREV = "9cc61520f4cd876b86e77edfeb88fbcd536d1f9d"
SRC_URI = "git://github.com/containerd/containerd;branch=release/1.4 \
file://0001-build-use-oe-provided-GO-and-flags.patch \
file://0001-Add-build-option-GODEBUG-1.patch \
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.4 \
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89"

-CONTAINERD_VERSION = "v1.4.12"
+CONTAINERD_VERSION = "v1.4.13"

EXTRA_OEMAKE += "GODEBUG=1"

--
2.33.0



Re: [PATCH v2] xen-tools: Fix xen-tools-xencommons do_package

Bruce Ashfield
 

On Tue, Apr 19, 2022 at 6:01 PM Bruce Ashfield via
lists.yoctoproject.org
<bruce.ashfield=gmail.com@...> wrote:

On Tue, Apr 19, 2022 at 4:38 PM Diego Sueiro <Diego.Sueiro@...> wrote:



--
Diego Sueiro
Staff Software Developer – Automotive and Industrial Solutions (CE-OSS)

-----Original Message-----
From: Diego Sueiro <Diego.Sueiro@...>
Sent: 19 April 2022 20:41
To: Diego Sueiro <Diego.Sueiro@...>; bruce.ashfield@...
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: RE: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package


-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Diego Sueiro via
lists.yoctoproject.org
Sent: 19 April 2022 20:28
To: bruce.ashfield@...
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: Re: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package

Hi Bruce,

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Bruce Ashfield via
lists.yoctoproject.org
Sent: 19 April 2022 20:17
To: Diego Sueiro <Diego.Sueiro@...>
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: Re: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package

On Tue, Apr 19, 2022 at 3:07 PM Diego Sueiro <diego.sueiro@...>
wrote:

Hi Bruce and Christopher,

I'm not sure if this is the best solution, since after fixing the
xen-tools
do_package, now I'm getting the following error on do_rootfs:
```
Installing : xen-tools-xencommons-4.15+stable0+84fa99099b-r0.
429/483
Running scriptlet: xen-tools-xencommons-4.15+stable0+84fa99099b-r0.
429/483
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
scriptlet start
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
execv(/bin/sh) pid 5408
+ set -e
+ systemctl
+ OPTS=
+ [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l
+ i
+ zation-image/1.0-r0/rootfs ]
+ OPTS=--root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/
+ e w aol-virtualization-image/1.0-r0/rootfs
+ [ enable = enable ]
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable proc-xen.mount
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable
+ var-lib-xenstored.mount systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable
+ xen-qemu-dom0-disk-backend.service
ln -s /lib/systemd/system/xen-qemu-dom0-disk-backend.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
n-qemu-dom0-disk-backend.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable xenconsoled.service
ln -s /lib/systemd/system/xenconsoled.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
nconsoled.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable xen-init-dom0.service
ln -s /lib/systemd/system/xen-init-dom0.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
n-init-dom0.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable xenstored.service
ln -s /lib/systemd/system/xenstored.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
nstored.service
+ [ -z
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l
+ i
+ zation-image/1.0-r0/rootfs ] [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs -o ! -d /run/systemd/system ] type
+ update-rc.d [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs ] OPT=-r
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs update-rc.d -r
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs xencommons defaults 80
update-rc.d:
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/init.d/xencommons: file does not exist
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
waitpid(5408) rc 5408 status 100
warning: %post(xen-tools-xencommons-4.15+stable0+84fa99099b-
r0.armv8a)
scriptlet failed, exit status 1

Error in POSTIN scriptlet in rpm package xen-tools-xencommons
Installing : xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r
430/483
Running scriptlet:
xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r
430/483
```

I guess that the "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6) patch introduced the issues for
do_package as well as do_rootfs.
Also, I never had the issue , at least using system, reported in the
commit
message. And as far as I understand systemd is capable of ignoring
sysvinit scripts.
Are you building sysvinit when you see the errors you are trying to
fix ? I've never seen them in either configuration here.

I can confirm that it isn't ignoring them by default, and I had
multiple reports of the serial port being setup twice, and causing
runtime /
login errors.

Bruce
These are my current settings:
VIRTUAL-RUNTIME_init_manager="systemd"
VIRTUAL-RUNTIME_initscripts="initscripts"
DISTRO_FEATURES_BACKFILL_CONSIDERED="sysvinit systemd"
DISTRO_FEATURES="acl alsa argp bluetooth debuginfod ext2 ipv4 ipv6
largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc
x11 vfat seccomp largefile opengl ptest multiarch wayland vulkan
virtualization ipv6 systemd seccomp k3s sysvinit xen ptest"
I guess I'll have to set the INIT_MANAGER variable to systemd instead:
https://git.yoctoproject.org/poky/commit/?id=a6ebbe3a10ff76386dde03ddaa
7097bdb2f5d9a5

I started a build, lets see how it goes.
I can confirm that by having INIT_MANAGER = "system" there are no issues for do_package and do_rootfs.
I'm sorry for the false alarm.
Hmmm. It should be packaged regardless. I have a build running, and
will see if I can trigger the issue.
Looking at ti more closely, I do think there's an issue lurking in
some configurations.

My suggestion to fix things up is this:

https://git.yoctoproject.org/meta-virtualization/commit/?h=master-next&id=51e404af981ab18391ca44d121fba71946abcc17

Where we just remove the init system files that we don't want .. which
matches the conditional packaging of xencommons

Bruce



Bruce


--
Diego


I'm just curious to see how will be the behaviour on the kirkstone branch.

--
Diego




--
Diego Sueiro
Staff Software Developer - Automotive and Industrial Solutions
(CE-OSS)

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Diego Sueiro
via lists.yoctoproject.org
Sent: 19 April 2022 19:32
To: meta-virtualization@...
Cc: christopher.w.clark@...; nd <nd@...>; Diego Sueiro
<Diego.Sueiro@...>
Subject: [meta-virtualization][PATCH v2] xen-tools: Fix
xen-tools-xencommons do_package

With the patch "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6), the following error is displayed:

ERROR: xen-tools-4.15+stableAUTOINC+84fa99099b-r0 do_package:
QA
Issue:
xen-tools: Files/directories were installed but not shipped in
any
package:
/etc/init.d/xencommons

To fix this, we need to conditionally include/exclude files in
do_install depending on whether or not systemd is in the
DISTRO_FEATURES.

Also, take the opportunity to have the relevant extra sed
processing in these conditionals.

Signed-off-by: Diego Sueiro <diego.sueiro@...>

Change since v1:
* Added missing ${D} when removing unnecessary files.
---
recipes-extended/xen/xen-tools.inc | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc
b/recipes-extended/xen/xen- tools.inc index 6bbc8cd..4acf054 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -805,14 +805,22 @@ do_install() {
for i in $VOLATILE_DIRS; do
echo "d $i 0755 root root - -" >>
${D}${sysconfdir}/tmpfiles.d/xen.conf
done
- fi

- # fixup default path to qemu-system-i386
- sed -i 's#\(test -z "$QEMU_XEN" &&
QEMU_XEN=\).*$#\1"/usr/bin/qemu-
system-i386"#' ${D}/etc/init.d/xencommons
+ if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
+ sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
+ ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ fi
+
+ # remove sysvinit specific file:
+ rm -rf ${D}${sysconfdir}/init.d/xencommons
+
+ # sysvinit
+ else
+ # fixup default path to qemu-system-i386
+ sed -i 's#\(test -z "$QEMU_XEN" &&
+ QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#'
+ ${D}/etc/init.d/xencommons

- if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
- sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
- ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ # remove systemd specific files
+ rm -rf ${D}${systemd_unitdir}
fi
}

--
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 v2] xen-tools: Fix xen-tools-xencommons do_package

Bruce Ashfield
 

On Tue, Apr 19, 2022 at 4:38 PM Diego Sueiro <Diego.Sueiro@...> wrote:



--
Diego Sueiro
Staff Software Developer – Automotive and Industrial Solutions (CE-OSS)

-----Original Message-----
From: Diego Sueiro <Diego.Sueiro@...>
Sent: 19 April 2022 20:41
To: Diego Sueiro <Diego.Sueiro@...>; bruce.ashfield@...
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: RE: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package


-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Diego Sueiro via
lists.yoctoproject.org
Sent: 19 April 2022 20:28
To: bruce.ashfield@...
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: Re: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package

Hi Bruce,

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Bruce Ashfield via
lists.yoctoproject.org
Sent: 19 April 2022 20:17
To: Diego Sueiro <Diego.Sueiro@...>
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: Re: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package

On Tue, Apr 19, 2022 at 3:07 PM Diego Sueiro <diego.sueiro@...>
wrote:

Hi Bruce and Christopher,

I'm not sure if this is the best solution, since after fixing the
xen-tools
do_package, now I'm getting the following error on do_rootfs:
```
Installing : xen-tools-xencommons-4.15+stable0+84fa99099b-r0.
429/483
Running scriptlet: xen-tools-xencommons-4.15+stable0+84fa99099b-r0.
429/483
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
scriptlet start
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
execv(/bin/sh) pid 5408
+ set -e
+ systemctl
+ OPTS=
+ [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l
+ i
+ zation-image/1.0-r0/rootfs ]
+ OPTS=--root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/
+ e w aol-virtualization-image/1.0-r0/rootfs
+ [ enable = enable ]
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable proc-xen.mount
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable
+ var-lib-xenstored.mount systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable
+ xen-qemu-dom0-disk-backend.service
ln -s /lib/systemd/system/xen-qemu-dom0-disk-backend.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
n-qemu-dom0-disk-backend.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable xenconsoled.service
ln -s /lib/systemd/system/xenconsoled.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
nconsoled.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable xen-init-dom0.service
ln -s /lib/systemd/system/xen-init-dom0.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
n-init-dom0.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable xenstored.service
ln -s /lib/systemd/system/xenstored.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
nstored.service
+ [ -z
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l
+ i
+ zation-image/1.0-r0/rootfs ] [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs -o ! -d /run/systemd/system ] type
+ update-rc.d [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs ] OPT=-r
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs update-rc.d -r
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs xencommons defaults 80
update-rc.d:
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/init.d/xencommons: file does not exist
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
waitpid(5408) rc 5408 status 100
warning: %post(xen-tools-xencommons-4.15+stable0+84fa99099b-
r0.armv8a)
scriptlet failed, exit status 1

Error in POSTIN scriptlet in rpm package xen-tools-xencommons
Installing : xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r
430/483
Running scriptlet:
xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r
430/483
```

I guess that the "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6) patch introduced the issues for
do_package as well as do_rootfs.
Also, I never had the issue , at least using system, reported in the
commit
message. And as far as I understand systemd is capable of ignoring
sysvinit scripts.
Are you building sysvinit when you see the errors you are trying to
fix ? I've never seen them in either configuration here.

I can confirm that it isn't ignoring them by default, and I had
multiple reports of the serial port being setup twice, and causing
runtime /
login errors.

Bruce
These are my current settings:
VIRTUAL-RUNTIME_init_manager="systemd"
VIRTUAL-RUNTIME_initscripts="initscripts"
DISTRO_FEATURES_BACKFILL_CONSIDERED="sysvinit systemd"
DISTRO_FEATURES="acl alsa argp bluetooth debuginfod ext2 ipv4 ipv6
largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc
x11 vfat seccomp largefile opengl ptest multiarch wayland vulkan
virtualization ipv6 systemd seccomp k3s sysvinit xen ptest"
I guess I'll have to set the INIT_MANAGER variable to systemd instead:
https://git.yoctoproject.org/poky/commit/?id=a6ebbe3a10ff76386dde03ddaa
7097bdb2f5d9a5

I started a build, lets see how it goes.
I can confirm that by having INIT_MANAGER = "system" there are no issues for do_package and do_rootfs.
I'm sorry for the false alarm.
Hmmm. It should be packaged regardless. I have a build running, and
will see if I can trigger the issue.

Bruce


--
Diego


I'm just curious to see how will be the behaviour on the kirkstone branch.

--
Diego




--
Diego Sueiro
Staff Software Developer - Automotive and Industrial Solutions
(CE-OSS)

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Diego Sueiro
via lists.yoctoproject.org
Sent: 19 April 2022 19:32
To: meta-virtualization@...
Cc: christopher.w.clark@...; nd <nd@...>; Diego Sueiro
<Diego.Sueiro@...>
Subject: [meta-virtualization][PATCH v2] xen-tools: Fix
xen-tools-xencommons do_package

With the patch "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6), the following error is displayed:

ERROR: xen-tools-4.15+stableAUTOINC+84fa99099b-r0 do_package:
QA
Issue:
xen-tools: Files/directories were installed but not shipped in
any
package:
/etc/init.d/xencommons

To fix this, we need to conditionally include/exclude files in
do_install depending on whether or not systemd is in the
DISTRO_FEATURES.

Also, take the opportunity to have the relevant extra sed
processing in these conditionals.

Signed-off-by: Diego Sueiro <diego.sueiro@...>

Change since v1:
* Added missing ${D} when removing unnecessary files.
---
recipes-extended/xen/xen-tools.inc | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc
b/recipes-extended/xen/xen- tools.inc index 6bbc8cd..4acf054 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -805,14 +805,22 @@ do_install() {
for i in $VOLATILE_DIRS; do
echo "d $i 0755 root root - -" >>
${D}${sysconfdir}/tmpfiles.d/xen.conf
done
- fi

- # fixup default path to qemu-system-i386
- sed -i 's#\(test -z "$QEMU_XEN" &&
QEMU_XEN=\).*$#\1"/usr/bin/qemu-
system-i386"#' ${D}/etc/init.d/xencommons
+ if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
+ sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
+ ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ fi
+
+ # remove sysvinit specific file:
+ rm -rf ${D}${sysconfdir}/init.d/xencommons
+
+ # sysvinit
+ else
+ # fixup default path to qemu-system-i386
+ sed -i 's#\(test -z "$QEMU_XEN" &&
+ QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#'
+ ${D}/etc/init.d/xencommons

- if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
- sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
- ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ # remove systemd specific files
+ rm -rf ${D}${systemd_unitdir}
fi
}

--
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


Re: [PATCH v2] xen-tools: Fix xen-tools-xencommons do_package

Diego Sueiro
 

--
Diego Sueiro
Staff Software Developer – Automotive and Industrial Solutions (CE-OSS)

-----Original Message-----
From: Diego Sueiro <Diego.Sueiro@...>
Sent: 19 April 2022 20:41
To: Diego Sueiro <Diego.Sueiro@...>; bruce.ashfield@...
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: RE: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package


-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Diego Sueiro via
lists.yoctoproject.org
Sent: 19 April 2022 20:28
To: bruce.ashfield@...
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: Re: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package

Hi Bruce,

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Bruce Ashfield via
lists.yoctoproject.org
Sent: 19 April 2022 20:17
To: Diego Sueiro <Diego.Sueiro@...>
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: Re: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package

On Tue, Apr 19, 2022 at 3:07 PM Diego Sueiro <diego.sueiro@...>
wrote:

Hi Bruce and Christopher,

I'm not sure if this is the best solution, since after fixing the
xen-tools
do_package, now I'm getting the following error on do_rootfs:
```
Installing : xen-tools-xencommons-4.15+stable0+84fa99099b-r0.
429/483
Running scriptlet: xen-tools-xencommons-4.15+stable0+84fa99099b-r0.
429/483
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
scriptlet start
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
execv(/bin/sh) pid 5408
+ set -e
+ systemctl
+ OPTS=
+ [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l
+ i
+ zation-image/1.0-r0/rootfs ]
+ OPTS=--root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/
+ e w aol-virtualization-image/1.0-r0/rootfs
+ [ enable = enable ]
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable proc-xen.mount
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable
+ var-lib-xenstored.mount systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable
+ xen-qemu-dom0-disk-backend.service
ln -s /lib/systemd/system/xen-qemu-dom0-disk-backend.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
n-qemu-dom0-disk-backend.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable xenconsoled.service
ln -s /lib/systemd/system/xenconsoled.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
nconsoled.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable xen-init-dom0.service
ln -s /lib/systemd/system/xen-init-dom0.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
n-init-dom0.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol
+ - v irtualization-image/1.0-r0/rootfs enable xenstored.service
ln -s /lib/systemd/system/xenstored.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/
x
e
nstored.service
+ [ -z
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l
+ i
+ zation-image/1.0-r0/rootfs ] [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs -o ! -d /run/systemd/system ] type
+ update-rc.d [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs ] OPT=-r
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs update-rc.d -r
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtua
+ l i zation-image/1.0-r0/rootfs xencommons defaults 80
update-rc.d:
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
z
a
tion-image/1.0-r0/rootfs/etc/init.d/xencommons: file does not exist
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
waitpid(5408) rc 5408 status 100
warning: %post(xen-tools-xencommons-4.15+stable0+84fa99099b-
r0.armv8a)
scriptlet failed, exit status 1

Error in POSTIN scriptlet in rpm package xen-tools-xencommons
Installing : xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r
430/483
Running scriptlet:
xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r
430/483
```

I guess that the "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6) patch introduced the issues for
do_package as well as do_rootfs.
Also, I never had the issue , at least using system, reported in the
commit
message. And as far as I understand systemd is capable of ignoring
sysvinit scripts.
Are you building sysvinit when you see the errors you are trying to
fix ? I've never seen them in either configuration here.

I can confirm that it isn't ignoring them by default, and I had
multiple reports of the serial port being setup twice, and causing
runtime /
login errors.

Bruce
These are my current settings:
VIRTUAL-RUNTIME_init_manager="systemd"
VIRTUAL-RUNTIME_initscripts="initscripts"
DISTRO_FEATURES_BACKFILL_CONSIDERED="sysvinit systemd"
DISTRO_FEATURES="acl alsa argp bluetooth debuginfod ext2 ipv4 ipv6
largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc
x11 vfat seccomp largefile opengl ptest multiarch wayland vulkan
virtualization ipv6 systemd seccomp k3s sysvinit xen ptest"
I guess I'll have to set the INIT_MANAGER variable to systemd instead:
https://git.yoctoproject.org/poky/commit/?id=a6ebbe3a10ff76386dde03ddaa
7097bdb2f5d9a5

I started a build, lets see how it goes.
I can confirm that by having INIT_MANAGER = "system" there are no issues for do_package and do_rootfs.
I'm sorry for the false alarm.

--
Diego


I'm just curious to see how will be the behaviour on the kirkstone branch.

--
Diego




--
Diego Sueiro
Staff Software Developer - Automotive and Industrial Solutions
(CE-OSS)

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Diego Sueiro
via lists.yoctoproject.org
Sent: 19 April 2022 19:32
To: meta-virtualization@...
Cc: christopher.w.clark@...; nd <nd@...>; Diego Sueiro
<Diego.Sueiro@...>
Subject: [meta-virtualization][PATCH v2] xen-tools: Fix
xen-tools-xencommons do_package

With the patch "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6), the following error is displayed:

ERROR: xen-tools-4.15+stableAUTOINC+84fa99099b-r0 do_package:
QA
Issue:
xen-tools: Files/directories were installed but not shipped in
any
package:
/etc/init.d/xencommons

To fix this, we need to conditionally include/exclude files in
do_install depending on whether or not systemd is in the
DISTRO_FEATURES.

Also, take the opportunity to have the relevant extra sed
processing in these conditionals.

Signed-off-by: Diego Sueiro <diego.sueiro@...>

Change since v1:
* Added missing ${D} when removing unnecessary files.
---
recipes-extended/xen/xen-tools.inc | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc
b/recipes-extended/xen/xen- tools.inc index 6bbc8cd..4acf054 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -805,14 +805,22 @@ do_install() {
for i in $VOLATILE_DIRS; do
echo "d $i 0755 root root - -" >>
${D}${sysconfdir}/tmpfiles.d/xen.conf
done
- fi

- # fixup default path to qemu-system-i386
- sed -i 's#\(test -z "$QEMU_XEN" &&
QEMU_XEN=\).*$#\1"/usr/bin/qemu-
system-i386"#' ${D}/etc/init.d/xencommons
+ if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
+ sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
+ ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ fi
+
+ # remove sysvinit specific file:
+ rm -rf ${D}${sysconfdir}/init.d/xencommons
+
+ # sysvinit
+ else
+ # fixup default path to qemu-system-i386
+ sed -i 's#\(test -z "$QEMU_XEN" &&
+ QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#'
+ ${D}/etc/init.d/xencommons

- if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
- sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
- ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ # remove systemd specific files
+ rm -rf ${D}${systemd_unitdir}
fi
}

--
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


Re: [PATCH v2] xen-tools: Fix xen-tools-xencommons do_package

Diego Sueiro
 

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Diego Sueiro via
lists.yoctoproject.org
Sent: 19 April 2022 20:28
To: bruce.ashfield@...
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: Re: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package

Hi Bruce,

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Bruce Ashfield via
lists.yoctoproject.org
Sent: 19 April 2022 20:17
To: Diego Sueiro <Diego.Sueiro@...>
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: Re: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package

On Tue, Apr 19, 2022 at 3:07 PM Diego Sueiro <diego.sueiro@...>
wrote:

Hi Bruce and Christopher,

I'm not sure if this is the best solution, since after fixing the
xen-tools
do_package, now I'm getting the following error on do_rootfs:
```
Installing : xen-tools-xencommons-4.15+stable0+84fa99099b-r0.
429/483
Running scriptlet: xen-tools-xencommons-4.15+stable0+84fa99099b-r0.
429/483
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
scriptlet start
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
execv(/bin/sh) pid 5408
+ set -e
+ systemctl
+ OPTS=
+ [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtual
+ i
+ zation-image/1.0-r0/rootfs ]
+ OPTS=--root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/e
+ w aol-virtualization-image/1.0-r0/rootfs
+ [ enable = enable ]
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-
+ v irtualization-image/1.0-r0/rootfs enable proc-xen.mount systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-
+ v irtualization-image/1.0-r0/rootfs enable var-lib-xenstored.mount
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-
+ v irtualization-image/1.0-r0/rootfs enable
+ xen-qemu-dom0-disk-backend.service
ln -s /lib/systemd/system/xen-qemu-dom0-disk-backend.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualiz
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/x
e
n-qemu-dom0-disk-backend.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-
+ v irtualization-image/1.0-r0/rootfs enable xenconsoled.service
ln -s /lib/systemd/system/xenconsoled.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualiz
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/x
e
nconsoled.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-
+ v irtualization-image/1.0-r0/rootfs enable xen-init-dom0.service
ln -s /lib/systemd/system/xen-init-dom0.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualiz
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/x
e
n-init-dom0.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-
+ v irtualization-image/1.0-r0/rootfs enable xenstored.service
ln -s /lib/systemd/system/xenstored.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualiz
a
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/x
e
nstored.service
+ [ -z
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtual
+ i
+ zation-image/1.0-r0/rootfs ] [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtual
+ i zation-image/1.0-r0/rootfs -o ! -d /run/systemd/system ] type
+ update-rc.d [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtual
+ i zation-image/1.0-r0/rootfs ] OPT=-r
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtual
+ i zation-image/1.0-r0/rootfs update-rc.d -r
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtual
+ i zation-image/1.0-r0/rootfs xencommons defaults 80
update-rc.d:
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualiz
a
tion-image/1.0-r0/rootfs/etc/init.d/xencommons: file does not exist
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
waitpid(5408) rc 5408 status 100
warning: %post(xen-tools-xencommons-4.15+stable0+84fa99099b-
r0.armv8a)
scriptlet failed, exit status 1

Error in POSTIN scriptlet in rpm package xen-tools-xencommons
Installing : xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r
430/483
Running scriptlet: xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r
430/483
```

I guess that the "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6) patch introduced the issues for
do_package as well as do_rootfs.
Also, I never had the issue , at least using system, reported in the
commit
message. And as far as I understand systemd is capable of ignoring
sysvinit scripts.
Are you building sysvinit when you see the errors you are trying to fix
? I've never seen them in either configuration here.

I can confirm that it isn't ignoring them by default, and I had
multiple reports of the serial port being setup twice, and causing runtime /
login errors.

Bruce
These are my current settings:
VIRTUAL-RUNTIME_init_manager="systemd"
VIRTUAL-RUNTIME_initscripts="initscripts"
DISTRO_FEATURES_BACKFILL_CONSIDERED="sysvinit systemd"
DISTRO_FEATURES="acl alsa argp bluetooth debuginfod ext2 ipv4 ipv6
largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat
seccomp largefile opengl ptest multiarch wayland vulkan virtualization ipv6
systemd seccomp k3s sysvinit xen ptest"
I guess I'll have to set the INIT_MANAGER variable to systemd instead:
https://git.yoctoproject.org/poky/commit/?id=a6ebbe3a10ff76386dde03ddaa7097bdb2f5d9a5

I started a build, lets see how it goes.

I'm just curious to see how will be the behaviour on the kirkstone branch.

--
Diego




--
Diego Sueiro
Staff Software Developer - Automotive and Industrial Solutions
(CE-OSS)

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Diego Sueiro via
lists.yoctoproject.org
Sent: 19 April 2022 19:32
To: meta-virtualization@...
Cc: christopher.w.clark@...; nd <nd@...>; Diego Sueiro
<Diego.Sueiro@...>
Subject: [meta-virtualization][PATCH v2] xen-tools: Fix
xen-tools-xencommons do_package

With the patch "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6), the following error is displayed:

ERROR: xen-tools-4.15+stableAUTOINC+84fa99099b-r0 do_package: QA
Issue:
xen-tools: Files/directories were installed but not shipped in any
package:
/etc/init.d/xencommons

To fix this, we need to conditionally include/exclude files in
do_install depending on whether or not systemd is in the
DISTRO_FEATURES.

Also, take the opportunity to have the relevant extra sed processing
in these conditionals.

Signed-off-by: Diego Sueiro <diego.sueiro@...>

Change since v1:
* Added missing ${D} when removing unnecessary files.
---
recipes-extended/xen/xen-tools.inc | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc
b/recipes-extended/xen/xen- tools.inc index 6bbc8cd..4acf054 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -805,14 +805,22 @@ do_install() {
for i in $VOLATILE_DIRS; do
echo "d $i 0755 root root - -" >>
${D}${sysconfdir}/tmpfiles.d/xen.conf
done
- fi

- # fixup default path to qemu-system-i386
- sed -i 's#\(test -z "$QEMU_XEN" &&
QEMU_XEN=\).*$#\1"/usr/bin/qemu-
system-i386"#' ${D}/etc/init.d/xencommons
+ if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
+ sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
+ ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ fi
+
+ # remove sysvinit specific file:
+ rm -rf ${D}${sysconfdir}/init.d/xencommons
+
+ # sysvinit
+ else
+ # fixup default path to qemu-system-i386
+ sed -i 's#\(test -z "$QEMU_XEN" &&
+ QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#'
+ ${D}/etc/init.d/xencommons

- if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
- sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
- ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ # remove systemd specific files
+ rm -rf ${D}${systemd_unitdir}
fi
}

--
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


Re: [PATCH v2] xen-tools: Fix xen-tools-xencommons do_package

Diego Sueiro
 

Hi Bruce,

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Bruce Ashfield via
lists.yoctoproject.org
Sent: 19 April 2022 20:17
To: Diego Sueiro <Diego.Sueiro@...>
Cc: meta-virtualization@...;
christopher.w.clark@...; nd <nd@...>
Subject: Re: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-
xencommons do_package

On Tue, Apr 19, 2022 at 3:07 PM Diego Sueiro <diego.sueiro@...> wrote:

Hi Bruce and Christopher,

I'm not sure if this is the best solution, since after fixing the xen-tools
do_package, now I'm getting the following error on do_rootfs:
```
Installing : xen-tools-xencommons-4.15+stable0+84fa99099b-r0.
429/483
Running scriptlet: xen-tools-xencommons-4.15+stable0+84fa99099b-r0.
429/483
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
scriptlet start
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
execv(/bin/sh) pid 5408
+ set -e
+ systemctl
+ OPTS=
+ [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
+ zation-image/1.0-r0/rootfs ]
+ OPTS=--root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ew
+ aol-virtualization-image/1.0-r0/rootfs
+ [ enable = enable ]
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-v
+ irtualization-image/1.0-r0/rootfs enable proc-xen.mount systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-v
+ irtualization-image/1.0-r0/rootfs enable var-lib-xenstored.mount
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-v
+ irtualization-image/1.0-r0/rootfs enable
+ xen-qemu-dom0-disk-backend.service
ln -s /lib/systemd/system/xen-qemu-dom0-disk-backend.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualiza
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xe
n-qemu-dom0-disk-backend.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-v
+ irtualization-image/1.0-r0/rootfs enable xenconsoled.service
ln -s /lib/systemd/system/xenconsoled.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualiza
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xe
nconsoled.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-v
+ irtualization-image/1.0-r0/rootfs enable xen-init-dom0.service
ln -s /lib/systemd/system/xen-init-dom0.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualiza
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xe
n-init-dom0.service
+ systemctl
+ --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-v
+ irtualization-image/1.0-r0/rootfs enable xenstored.service
ln -s /lib/systemd/system/xenstored.service
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualiza
tion-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xe
nstored.service
+ [ -z
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
+ zation-image/1.0-r0/rootfs ] [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
+ zation-image/1.0-r0/rootfs -o ! -d /run/systemd/system ] type
+ update-rc.d [ -n
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
+ zation-image/1.0-r0/rootfs ] OPT=-r
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
+ zation-image/1.0-r0/rootfs update-rc.d -r
+ /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtuali
+ zation-image/1.0-r0/rootfs xencommons defaults 80
update-rc.d:
/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualiza
tion-image/1.0-r0/rootfs/etc/init.d/xencommons: file does not exist
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a):
waitpid(5408) rc 5408 status 100
warning: %post(xen-tools-xencommons-4.15+stable0+84fa99099b-
r0.armv8a)
scriptlet failed, exit status 1

Error in POSTIN scriptlet in rpm package xen-tools-xencommons
Installing : xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r
430/483
Running scriptlet: xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r
430/483
```

I guess that the "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6) patch introduced the issues for do_package as
well as do_rootfs.
Also, I never had the issue , at least using system, reported in the commit
message. And as far as I understand systemd is capable of ignoring sysvinit
scripts.
Are you building sysvinit when you see the errors you are trying to fix ? I've
never seen them in either configuration here.

I can confirm that it isn't ignoring them by default, and I had multiple reports
of the serial port being setup twice, and causing runtime / login errors.

Bruce
These are my current settings:
VIRTUAL-RUNTIME_init_manager="systemd"
VIRTUAL-RUNTIME_initscripts="initscripts"
DISTRO_FEATURES_BACKFILL_CONSIDERED="sysvinit systemd"
DISTRO_FEATURES="acl alsa argp bluetooth debuginfod ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp largefile opengl ptest multiarch wayland vulkan virtualization ipv6 systemd seccomp k3s sysvinit xen ptest"

--
Diego



--
Diego Sueiro
Staff Software Developer - Automotive and Industrial Solutions
(CE-OSS)

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Diego Sueiro via
lists.yoctoproject.org
Sent: 19 April 2022 19:32
To: meta-virtualization@...
Cc: christopher.w.clark@...; nd <nd@...>; Diego Sueiro
<Diego.Sueiro@...>
Subject: [meta-virtualization][PATCH v2] xen-tools: Fix
xen-tools-xencommons do_package

With the patch "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6), the following error is displayed:

ERROR: xen-tools-4.15+stableAUTOINC+84fa99099b-r0 do_package: QA
Issue:
xen-tools: Files/directories were installed but not shipped in any package:
/etc/init.d/xencommons

To fix this, we need to conditionally include/exclude files in
do_install depending on whether or not systemd is in the
DISTRO_FEATURES.

Also, take the opportunity to have the relevant extra sed processing
in these conditionals.

Signed-off-by: Diego Sueiro <diego.sueiro@...>

Change since v1:
* Added missing ${D} when removing unnecessary files.
---
recipes-extended/xen/xen-tools.inc | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc
b/recipes-extended/xen/xen- tools.inc index 6bbc8cd..4acf054 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -805,14 +805,22 @@ do_install() {
for i in $VOLATILE_DIRS; do
echo "d $i 0755 root root - -" >>
${D}${sysconfdir}/tmpfiles.d/xen.conf
done
- fi

- # fixup default path to qemu-system-i386
- sed -i 's#\(test -z "$QEMU_XEN" &&
QEMU_XEN=\).*$#\1"/usr/bin/qemu-
system-i386"#' ${D}/etc/init.d/xencommons
+ if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
+ sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
+ ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ fi
+
+ # remove sysvinit specific file:
+ rm -rf ${D}${sysconfdir}/init.d/xencommons
+
+ # sysvinit
+ else
+ # fixup default path to qemu-system-i386
+ sed -i 's#\(test -z "$QEMU_XEN" &&
+ QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#'
+ ${D}/etc/init.d/xencommons

- if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
- sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
- ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ # remove systemd specific files
+ rm -rf ${D}${systemd_unitdir}
fi
}

--
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


Re: [PATCH v2] xen-tools: Fix xen-tools-xencommons do_package

Bruce Ashfield
 

On Tue, Apr 19, 2022 at 3:07 PM Diego Sueiro <diego.sueiro@...> wrote:

Hi Bruce and Christopher,

I'm not sure if this is the best solution, since after fixing the xen-tools do_package, now I'm getting the following error on do_rootfs:
```
Installing : xen-tools-xencommons-4.15+stable0+84fa99099b-r0. 429/483
Running scriptlet: xen-tools-xencommons-4.15+stable0+84fa99099b-r0. 429/483
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a): scriptlet start
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a): execv(/bin/sh) pid 5408
+ set -e
+ systemctl
+ OPTS=
+ [ -n /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs ]
+ OPTS=--root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs
+ [ enable = enable ]
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable proc-xen.mount
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable var-lib-xenstored.mount
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable xen-qemu-dom0-disk-backend.service
ln -s /lib/systemd/system/xen-qemu-dom0-disk-backend.service /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xen-qemu-dom0-disk-backend.service
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable xenconsoled.service
ln -s /lib/systemd/system/xenconsoled.service /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xenconsoled.service
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable xen-init-dom0.service
ln -s /lib/systemd/system/xen-init-dom0.service /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xen-init-dom0.service
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable xenstored.service
ln -s /lib/systemd/system/xenstored.service /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xenstored.service
+ [ -z /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs ]
+ [ -n /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs -o ! -d /run/systemd/system ]
+ type update-rc.d
+ [ -n /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs ]
+ OPT=-r /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs
+ update-rc.d -r /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs xencommons defaults 80
update-rc.d: /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs/etc/init.d/xencommons: file does not exist
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a): waitpid(5408) rc 5408 status 100
warning: %post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a) scriptlet failed, exit status 1

Error in POSTIN scriptlet in rpm package xen-tools-xencommons
Installing : xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r 430/483
Running scriptlet: xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r 430/483
```

I guess that the "xen: only package xencommon systemd components if systemd is enabled" (c9554c6) patch introduced the issues for do_package as well as do_rootfs.
Also, I never had the issue , at least using system, reported in the commit message. And as far as I understand systemd is capable of ignoring sysvinit scripts.
Are you building sysvinit when you see the errors you are trying to
fix ? I've never seen them in either configuration here.

I can confirm that it isn't ignoring them by default, and I had
multiple reports of the serial port being setup twice, and causing
runtime / login errors.

Bruce


--
Diego Sueiro
Staff Software Developer - Automotive and Industrial Solutions (CE-OSS)

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Diego Sueiro via
lists.yoctoproject.org
Sent: 19 April 2022 19:32
To: meta-virtualization@...
Cc: christopher.w.clark@...; nd <nd@...>; Diego Sueiro
<Diego.Sueiro@...>
Subject: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-xencommons
do_package

With the patch "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6), the following error is displayed:

ERROR: xen-tools-4.15+stableAUTOINC+84fa99099b-r0 do_package: QA
Issue:
xen-tools: Files/directories were installed but not shipped in any package:
/etc/init.d/xencommons

To fix this, we need to conditionally include/exclude files in do_install
depending on whether or not systemd is in the DISTRO_FEATURES.

Also, take the opportunity to have the relevant extra sed processing in these
conditionals.

Signed-off-by: Diego Sueiro <diego.sueiro@...>

Change since v1:
* Added missing ${D} when removing unnecessary files.
---
recipes-extended/xen/xen-tools.inc | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-
tools.inc
index 6bbc8cd..4acf054 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -805,14 +805,22 @@ do_install() {
for i in $VOLATILE_DIRS; do
echo "d $i 0755 root root - -" >> ${D}${sysconfdir}/tmpfiles.d/xen.conf
done
- fi

- # fixup default path to qemu-system-i386
- sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=\).*$#\1"/usr/bin/qemu-
system-i386"#' ${D}/etc/init.d/xencommons
+ if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
+ sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
+ ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ fi
+
+ # remove sysvinit specific file:
+ rm -rf ${D}${sysconfdir}/init.d/xencommons
+
+ # sysvinit
+ else
+ # fixup default path to qemu-system-i386
+ sed -i 's#\(test -z "$QEMU_XEN" &&
+ QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#'
+ ${D}/etc/init.d/xencommons

- if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
- sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
- ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
+ # remove systemd specific files
+ rm -rf ${D}${systemd_unitdir}
fi
}

--
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


Re: [PATCH v2] xen-tools: Fix xen-tools-xencommons do_package

Diego Sueiro
 

Hi Bruce and Christopher,

I'm not sure if this is the best solution, since after fixing the xen-tools do_package, now I'm getting the following error on do_rootfs:
```
Installing : xen-tools-xencommons-4.15+stable0+84fa99099b-r0. 429/483
Running scriptlet: xen-tools-xencommons-4.15+stable0+84fa99099b-r0. 429/483
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a): scriptlet start
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a): execv(/bin/sh) pid 5408
+ set -e
+ systemctl
+ OPTS=
+ [ -n /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs ]
+ OPTS=--root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs
+ [ enable = enable ]
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable proc-xen.mount
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable var-lib-xenstored.mount
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable xen-qemu-dom0-disk-backend.service
ln -s /lib/systemd/system/xen-qemu-dom0-disk-backend.service /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xen-qemu-dom0-disk-backend.service
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable xenconsoled.service
ln -s /lib/systemd/system/xenconsoled.service /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xenconsoled.service
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable xen-init-dom0.service
ln -s /lib/systemd/system/xen-init-dom0.service /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xen-init-dom0.service
+ systemctl --root=/[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs enable xenstored.service
ln -s /lib/systemd/system/xenstored.service /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs/etc/systemd/system/multi-user.target.wants/xenstored.service
+ [ -z /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs ]
+ [ -n /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs -o ! -d /run/systemd/system ]
+ type update-rc.d
+ [ -n /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs ]
+ OPT=-r /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs
+ update-rc.d -r /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs xencommons defaults 80
update-rc.d: /[...]/build/tmp_virtualization/work/n1sdp-poky-linux/ewaol-virtualization-image/1.0-r0/rootfs/etc/init.d/xencommons: file does not exist
%post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a): waitpid(5408) rc 5408 status 100
warning: %post(xen-tools-xencommons-4.15+stable0+84fa99099b-r0.armv8a) scriptlet failed, exit status 1

Error in POSTIN scriptlet in rpm package xen-tools-xencommons
Installing : xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r 430/483
Running scriptlet: xen-tools-xen-watchdog-4.15+stable0+84fa99099b-r 430/483
```

I guess that the "xen: only package xencommon systemd components if systemd is enabled" (c9554c6) patch introduced the issues for do_package as well as do_rootfs.
Also, I never had the issue , at least using system, reported in the commit message. And as far as I understand systemd is capable of ignoring sysvinit scripts.


--
Diego Sueiro
Staff Software Developer - Automotive and Industrial Solutions (CE-OSS)

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Diego Sueiro via
lists.yoctoproject.org
Sent: 19 April 2022 19:32
To: meta-virtualization@...
Cc: christopher.w.clark@...; nd <nd@...>; Diego Sueiro
<Diego.Sueiro@...>
Subject: [meta-virtualization][PATCH v2] xen-tools: Fix xen-tools-xencommons
do_package

With the patch "xen: only package xencommon systemd components if
systemd is enabled" (c9554c6), the following error is displayed:

ERROR: xen-tools-4.15+stableAUTOINC+84fa99099b-r0 do_package: QA
Issue:
xen-tools: Files/directories were installed but not shipped in any package:
/etc/init.d/xencommons

To fix this, we need to conditionally include/exclude files in do_install
depending on whether or not systemd is in the DISTRO_FEATURES.

Also, take the opportunity to have the relevant extra sed processing in these
conditionals.

Signed-off-by: Diego Sueiro <diego.sueiro@...>

Change since v1:
* Added missing ${D} when removing unnecessary files.
---
recipes-extended/xen/xen-tools.inc | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-
tools.inc
index 6bbc8cd..4acf054 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -805,14 +805,22 @@ do_install() {
for i in $VOLATILE_DIRS; do
echo "d $i 0755 root root - -" >> ${D}${sysconfdir}/tmpfiles.d/xen.conf
done
- fi

- # fixup default path to qemu-system-i386
- sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=\).*$#\1"/usr/bin/qemu-
system-i386"#' ${D}/etc/init.d/xencommons
+ if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
+ sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
+ ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service
+ fi
+
+ # remove sysvinit specific file:
+ rm -rf ${D}${sysconfdir}/init.d/xencommons
+
+ # sysvinit
+ else
+ # fixup default path to qemu-system-i386
+ sed -i 's#\(test -z "$QEMU_XEN" &&
+ QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#'
+ ${D}/etc/init.d/xencommons

- if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-
backend.service ]; then
- sed -i 's#ExecStart=.*qemu-system-
i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
- ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
+ # remove systemd specific files
+ rm -rf ${D}${systemd_unitdir}
fi
}

--
2.35.1


[PATCH v2] xen-tools: Fix xen-tools-xencommons do_package

Diego Sueiro
 

With the patch "xen: only package xencommon systemd components if systemd=
is
enabled" (c9554c6), the following error is displayed:

ERROR: xen-tools-4.15+stableAUTOINC+84fa99099b-r0 do_package: QA Issu=
e:
xen-tools: Files/directories were installed but not shipped in any pa=
ckage:
/etc/init.d/xencommons

To fix this, we need to conditionally include/exclude files in do_install
depending on whether or not systemd is in the DISTRO_FEATURES.

Also, take the opportunity to have the relevant extra sed processing in t=
hese
conditionals.

Signed-off-by: Diego Sueiro <diego.sueiro@...>

Change since v1:
* Added missing ${D} when removing unnecessary files.
---
recipes-extended/xen/xen-tools.inc | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xe=
n-tools.inc
index 6bbc8cd..4acf054 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -805,14 +805,22 @@ do_install() {
for i in $VOLATILE_DIRS; do
echo "d $i 0755 root root - -" >> ${D}${sysconfdir}/tmpfile=
s.d/xen.conf
done
- fi
=20
- # fixup default path to qemu-system-i386
- sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=3D\).*$#\1"/usr/bin/qemu=
-system-i386"#' ${D}/etc/init.d/xencommons
+ if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend=
.service ]; then
+ sed -i 's#ExecStart=3D.*qemu-system-i386\(.*\)$#ExecStart=3D=
/usr/bin/qemu-system-i386\1#' \
+ ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend=
.service
+ fi
+
+ # remove sysvinit specific file:
+ rm -rf ${D}${sysconfdir}/init.d/xencommons
+
+ # sysvinit
+ else
+ # fixup default path to qemu-system-i386
+ sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=3D\).*$#\1"/usr/bin/=
qemu-system-i386"#' ${D}/etc/init.d/xencommons
=20
- if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.ser=
vice ]; then
- sed -i 's#ExecStart=3D.*qemu-system-i386\(.*\)$#ExecStart=3D/usr=
/bin/qemu-system-i386\1#' \
- ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.ser=
vice
+ # remove systemd specific files
+ rm -rf ${D}${systemd_unitdir}
fi
}
=20
--=20
2.35.1


Re: [PATCH] xen-tools: Fix xen-tools-xencommons do_package

Bertrand Marquis
 

Hi Diego,

On 19 Apr 2022, at 17:33, Diego Sueiro via lists.yoctoproject.org <diego.sueiro=arm.com@...> wrote:

With the patch "xen: only package xencommon systemd components if systemd is
enabled" (c9554c6), the following error is displayed:

ERROR: xen-tools-4.15+stableAUTOINC+84fa99099b-r0 do_package: QA Issue:
xen-tools: Files/directories were installed but not shipped in any package:
/etc/init.d/xencommons

To fix this, we need to conditionally include/exclude files in do_install
depending on whether or not systemd is in the DISTRO_FEATURES.

Also, take the opportunity to have the relevant extra sed processing in these
conditionals.

Signed-off-by: Diego Sueiro <diego.sueiro@...>
Reviewed-by: Bertrand Marquis <bertrand.marquis@...>

Cheers
Bertrand

---
recipes-extended/xen/xen-tools.inc | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc
index 6bbc8cd..cf2a344 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -805,14 +805,22 @@ do_install() {
for i in $VOLATILE_DIRS; do
echo "d $i 0755 root root - -" >> ${D}${sysconfdir}/tmpfiles.d/xen.conf
done
- fi

- # fixup default path to qemu-system-i386
- sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#' ${D}/etc/init.d/xencommons
+ if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service ]; then
+ sed -i 's#ExecStart=.*qemu-system-i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
+ ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
+ fi
+
+ # remove sysvinit specific file:
+ rm -rf ${sysconfdir}/init.d/xencommons
+
+ # sysvinit
+ else
+ # fixup default path to qemu-system-i386
+ sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#' ${D}/etc/init.d/xencommons

- if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service ]; then
- sed -i 's#ExecStart=.*qemu-system-i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
- ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
+ # remove systemd specific files
+ rm -rf ${systemd_unitdir}
fi
}

--
2.35.1




[PATCH] xen-tools: Fix xen-tools-xencommons do_package

Diego Sueiro
 

With the patch "xen: only package xencommon systemd components if systemd=
is
enabled" (c9554c6), the following error is displayed:

ERROR: xen-tools-4.15+stableAUTOINC+84fa99099b-r0 do_package: QA Issu=
e:
xen-tools: Files/directories were installed but not shipped in any pa=
ckage:
/etc/init.d/xencommons

To fix this, we need to conditionally include/exclude files in do_install
depending on whether or not systemd is in the DISTRO_FEATURES.

Also, take the opportunity to have the relevant extra sed processing in t=
hese
conditionals.

Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
recipes-extended/xen/xen-tools.inc | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xe=
n-tools.inc
index 6bbc8cd..cf2a344 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -805,14 +805,22 @@ do_install() {
for i in $VOLATILE_DIRS; do
echo "d $i 0755 root root - -" >> ${D}${sysconfdir}/tmpfile=
s.d/xen.conf
done
- fi
=20
- # fixup default path to qemu-system-i386
- sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=3D\).*$#\1"/usr/bin/qemu=
-system-i386"#' ${D}/etc/init.d/xencommons
+ if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend=
.service ]; then
+ sed -i 's#ExecStart=3D.*qemu-system-i386\(.*\)$#ExecStart=3D=
/usr/bin/qemu-system-i386\1#' \
+ ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend=
.service
+ fi
+
+ # remove sysvinit specific file:
+ rm -rf ${sysconfdir}/init.d/xencommons
+
+ # sysvinit
+ else
+ # fixup default path to qemu-system-i386
+ sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=3D\).*$#\1"/usr/bin/=
qemu-system-i386"#' ${D}/etc/init.d/xencommons
=20
- if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.ser=
vice ]; then
- sed -i 's#ExecStart=3D.*qemu-system-i386\(.*\)$#ExecStart=3D/usr=
/bin/qemu-system-i386\1#' \
- ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.ser=
vice
+ # remove systemd specific files
+ rm -rf ${systemd_unitdir}
fi
}
=20
--=20
2.35.1


[PATCH v2 3/3] xen: Remove 4.14 recipes and related patches

Michal Orzel
 

We shall only have recipes for the last two stable releases, thus
get rid of the 4.14 recipes and the corresponding patches.

Signed-off-by: Michal Orzel <michal.orzel@...>
Reviewed-by: Christopher Clark <christopher.w.clark@...>
Reviewed-by: Bertrand Marquis <bertrand.marquis@...>
---
Changes since v1:
-none
---
...-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_4.14.bb | 19 --
5 files changed, 367 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
delete mode 100644 recipes-extended/xen/xen_4.14.bb

diff --git a/recipes-extended/xen/files/0001-firmware-provide-a-stand-alone-set-of-headers-Xen-4.14.patch b/recipes-extended/xen/files/0001-firmware-provide-a-stand-alone-set-of-headers-Xen-4.14.patch
deleted file mode 100644
index 7b062b7..0000000
--- a/recipes-extended/xen/files/0001-firmware-provide-a-stand-alone-set-of-headers-Xen-4.14.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 73b13705af7c3bb8fdf11932eb68788d090a443f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@...>
-Date: Thu, 4 Mar 2021 16:49:00 +0100
-Subject: [PATCH] firmware: provide a stand alone set of headers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The current build of the firmware relies on having 32bit compatible
-headers installed in order to build some of the 32bit firmware.
-Usually this can be solved by using the -ffreestanding compiler option
-which drops the usage of the system headers in favor of a private set
-of freestanding headers provided by the compiler itself that are not
-tied to libc.
-
-However such option is broken at least in the gcc compiler provided in
-Alpine Linux, as the system include path (ie: /usr/include) takes
-precedence over the gcc private include path:
-
-#include <...> search starts here:
- /usr/include
- /usr/lib/gcc/x86_64-alpine-linux-musl/10.2.1/include
-
-And the headers in /usr/include are exclusively 64bit.
-
-Since -ffreestanding is currently broken on at least that distro, and
-for resilience against future compilers also having the option broken
-provide a set of stand alone 32bit headers required for the firmware
-build.
-
-Signed-off-by: Roger Pau Monné <roger.pau@...>
-Reviewed-by: Jan Beulich <jbeulich@...>
-Release-Acked-by: Ian Jackson <iwj@...>
-Applied to Xen 4.14 by: Christopher Clark <christopher.w.clark@...>
----
- tools/firmware/Rules.mk | 13 +++++++
- tools/firmware/include/stdarg.h | 10 +++++
- tools/firmware/include/stdbool.h | 9 +++++
- tools/firmware/include/stddef.h | 10 +++++
- tools/firmware/include/stdint.h | 39 +++++++++++++++++++
- tools/firmware/rombios/32bit/rombios_compat.h | 4 +-
- 6 files changed, 82 insertions(+), 3 deletions(-)
- create mode 100644 tools/firmware/include/stdarg.h
- create mode 100644 tools/firmware/include/stdbool.h
- create mode 100644 tools/firmware/include/stddef.h
- create mode 100644 tools/firmware/include/stdint.h
-
-diff --git a/tools/firmware/include/stdarg.h b/tools/firmware/include/stdarg.h
-new file mode 100644
-index 0000000000..c5e3761cd2
---- /dev/null
-+++ b/tools/firmware/include/stdarg.h
-@@ -0,0 +1,10 @@
-+#ifndef _STDARG_H_
-+#define _STDARG_H_
-+
-+typedef __builtin_va_list va_list;
-+#define va_copy(dest, src) __builtin_va_copy(dest, src)
-+#define va_start(ap, last) __builtin_va_start(ap, last)
-+#define va_end(ap) __builtin_va_end(ap)
-+#define va_arg __builtin_va_arg
-+
-+#endif
-diff --git a/tools/firmware/include/stdbool.h b/tools/firmware/include/stdbool.h
-new file mode 100644
-index 0000000000..0cf76b106c
---- /dev/null
-+++ b/tools/firmware/include/stdbool.h
-@@ -0,0 +1,9 @@
-+#ifndef _STDBOOL_H_
-+#define _STDBOOL_H_
-+
-+#define bool _Bool
-+#define true 1
-+#define false 0
-+#define __bool_true_false_are_defined 1
-+
-+#endif
-diff --git a/tools/firmware/include/stddef.h b/tools/firmware/include/stddef.h
-new file mode 100644
-index 0000000000..c7f974608a
---- /dev/null
-+++ b/tools/firmware/include/stddef.h
-@@ -0,0 +1,10 @@
-+#ifndef _STDDEF_H_
-+#define _STDDEF_H_
-+
-+typedef __SIZE_TYPE__ size_t;
-+
-+#define NULL ((void*)0)
-+
-+#define offsetof(t, m) __builtin_offsetof(t, m)
-+
-+#endif
-diff --git a/tools/firmware/include/stdint.h b/tools/firmware/include/stdint.h
-new file mode 100644
-index 0000000000..16a0b6de19
---- /dev/null
-+++ b/tools/firmware/include/stdint.h
-@@ -0,0 +1,39 @@
-+#ifndef _STDINT_H_
-+#define _STDINT_H_
-+
-+#if defined(__LP64__) || defined(__P64__)
-+#error "32bit only header"
-+#endif
-+
-+typedef unsigned char uint8_t;
-+typedef signed char int8_t;
-+
-+typedef unsigned short uint16_t;
-+typedef signed short int16_t;
-+
-+typedef unsigned int uint32_t;
-+typedef signed int int32_t;
-+
-+typedef unsigned long long uint64_t;
-+typedef signed long long int64_t;
-+
-+#define INT8_MIN (-0x7f-1)
-+#define INT16_MIN (-0x7fff-1)
-+#define INT32_MIN (-0x7fffffff-1)
-+#define INT64_MIN (-0x7fffffffffffffffll-1)
-+
-+#define INT8_MAX 0x7f
-+#define INT16_MAX 0x7fff
-+#define INT32_MAX 0x7fffffff
-+#define INT64_MAX 0x7fffffffffffffffll
-+
-+#define UINT8_MAX 0xff
-+#define UINT16_MAX 0xffff
-+#define UINT32_MAX 0xffffffffu
-+#define UINT64_MAX 0xffffffffffffffffull
-+
-+typedef uint32_t uintptr_t;
-+
-+#define UINTPTR_MAX UINT32_MAX
-+
-+#endif
-diff --git a/tools/firmware/rombios/32bit/rombios_compat.h b/tools/firmware/rombios/32bit/rombios_compat.h
-index 3fe7d67721..8ba4c17ffd 100644
---- a/tools/firmware/rombios/32bit/rombios_compat.h
-+++ b/tools/firmware/rombios/32bit/rombios_compat.h
-@@ -8,9 +8,7 @@
-
- #define ADDR_FROM_SEG_OFF(seg, off) (void *)((((uint32_t)(seg)) << 4) + (off))
-
--typedef unsigned char uint8_t;
--typedef unsigned short int uint16_t;
--typedef unsigned int uint32_t;
-+#include <stdint.h>
-
- typedef uint8_t Bit8u;
- typedef uint16_t Bit16u;
-diff --git a/tools/firmware/Rules.mk b/tools/firmware/Rules.mk
-index 26bbddccd4..cb388b7011 100644
---- a/tools/firmware/Rules.mk
-+++ b/tools/firmware/Rules.mk
-@@ -17,3 +17,16 @@ $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
-
- # Extra CFLAGS suitable for an embedded type of environment.
- CFLAGS += -fno-builtin -msoft-float
-+
-+# Use our own set of stand alone headers to build firmware.
-+#
-+# Ideally using -ffreestanding should be enough, but that relies on the
-+# compiler having the right order for include paths (ie: compiler private
-+# headers before system ones) or the libc headers having proper arch-agnostic
-+# freestanding support. This is not the case in Alpine at least which searches
-+# system headers before compiler ones and has arch-specific libc headers. This
-+# has been reported upstream:
-+# https://gitlab.alpinelinux.org/alpine/aports/-/issues/12477
-+# In the meantime (and for resilience against broken systems) use our own set
-+# of headers that provide what's needed for the firmware build.
-+CFLAGS += -nostdinc -I$(XEN_ROOT)/tools/firmware/include
---
-2.25.1
-
diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch
deleted file mode 100644
index f0688fd..0000000
--- a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From d79dcc2002008c58683de82f06c168d6eea57991 Mon Sep 17 00:00:00 2001
-From: Maciej Pijanowski <maciej.pijanowski@...>
-Date: Fri, 19 Oct 2018 11:01:37 +0200
-Subject: [PATCH] python,pygrub: pass DISTUTILS env vars as setup.py args
-
-Allow to respect the target install dir (PYTHON_SITEPACKAGES_DIR)
-as well as other parameters set by the OpenEmbedded build system.
-This is especially useful when the target libdir is not the default one
-(/usr/lib), but for example /usr/lib64.
-
-Signed-off-by: Maciej Pijanowski <maciej.pijanowski@...>
-
-Forward-ported to Xen 4.12.0
-Signed-off-by: Christopher Clark <christopher.clark6@...>
-
-Modified to support pygrub installation with python 3
-Signed-off-by: Christopher Clark <christopher.clark6@...>
-
-Forward-ported to Xen 4.14.0
-Signed-off-by: Christopher Clark <christopher.clark6@...>
-diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
-index 3063c49..513314b 100644
---- a/tools/pygrub/Makefile
-+++ b/tools/pygrub/Makefile
-@@ -10,14 +10,17 @@ INSTALL_LOG = build/installed_files.txt
- all: build
- .PHONY: build
- build:
-- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
-+ CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS)
-
- .PHONY: install
- install: all
- $(INSTALL_DIR) $(DESTDIR)/$(bindir)
- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \
- setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
-- --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force
-+ --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force \
-+ $(DISTUTILS_INSTALL_ARGS)
-+ rm -f $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
-+ $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
- set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
- "`readlink -f $(DESTDIR)/$(bindir)`" != \
- "`readlink -f $(LIBEXEC_BIN)`" ]; then \
-diff --git a/tools/python/Makefile b/tools/python/Makefile
-index 541858e..4d4a344 100644
---- a/tools/python/Makefile
-+++ b/tools/python/Makefile
-@@ -10,7 +10,7 @@ INSTALL_LOG = build/installed_files.txt
-
- .PHONY: build
- build:
-- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py build
-+ CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS)
-
- .PHONY: install
- install:
-@@ -18,7 +18,7 @@ install:
-
- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \
- setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
-- --root="$(DESTDIR)" --force
-+ --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS)
-
- $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN)
- $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN)
diff --git a/recipes-extended/xen/files/0001-tools-firmware-Build-firmware-as-ffreestanding-Xen-4.14.patch b/recipes-extended/xen/files/0001-tools-firmware-Build-firmware-as-ffreestanding-Xen-4.14.patch
deleted file mode 100644
index 001b196..0000000
--- a/recipes-extended/xen/files/0001-tools-firmware-Build-firmware-as-ffreestanding-Xen-4.14.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 0eae016b6e3dce69e3fb86aca5c4f221591a2f12 Mon Sep 17 00:00:00 2001
-From: Andrew Cooper <andrew.cooper3@...>
-Date: Thu, 25 Feb 2021 19:15:08 +0000
-Subject: [PATCH] tools/firmware: Build firmware as -ffreestanding
-
-firmware should always have been -ffreestanding, as it doesn't execute in the
-host environment. -ffreestanding implies -fno-builtin, so replace the option.
-
-inttypes.h isn't a freestanding header, but the 32bitbios_support.c only wants
-the stdint.h types so switch to the more appropriate include.
-
-This removes the build time dependency on a 32bit libc just to compile the
-hvmloader and friends.
-
-Update README and the TravisCI configuration.
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@...>
-Reviewed-by: Jan Beulich <jbeulich@...>
-Reviewed-by: Ian Jackson <iwj@...>
-Release-Acked-by: Ian Jackson <iwj@...>
-Applied to m-v Xen 4.14 series: Christopher Clark <christopher.w.clark@...>
----
- .travis.yml | 1 -
- README | 3 ---
- tools/firmware/Rules.mk | 2 +-
- tools/firmware/hvmloader/32bitbios_support.c | 2 +-
- 4 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index 15ca9e9047..2362475f7a 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -58,7 +58,6 @@ addons:
- - acpica-tools
- - bin86
- - bcc
-- - libc6-dev-i386
- - libnl-3-dev
- - ocaml-nox
- - libfindlib-ocaml-dev
-diff --git a/README b/README
-index 6e15242ae1..8c99c30986 100644
---- a/README
-+++ b/README
-@@ -62,9 +62,6 @@ provided by your OS distributor:
- * GNU bison and GNU flex
- * GNU gettext
- * ACPI ASL compiler (iasl)
-- * Libc multiarch package (e.g. libc6-dev-i386 / glibc-devel.i686).
-- Required when building on a 64-bit platform to build
-- 32-bit components which are enabled on a default build.
-
- In addition to the above there are a number of optional build
- prerequisites. Omitting these will cause the related features to be
-diff --git a/tools/firmware/Rules.mk b/tools/firmware/Rules.mk
-index cb388b7011..9f78a7dec9 100644
---- a/tools/firmware/Rules.mk
-+++ b/tools/firmware/Rules.mk
-@@ -16,7 +16,7 @@ CFLAGS += -Werror
- $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
-
- # Extra CFLAGS suitable for an embedded type of environment.
--CFLAGS += -fno-builtin -msoft-float
-+CFLAGS += -ffreestanding -msoft-float
-
- # Use our own set of stand alone headers to build firmware.
- #
-diff --git a/tools/firmware/hvmloader/32bitbios_support.c b/tools/firmware/hvmloader/32bitbios_support.c
-index 114135022e..ef681d4f57 100644
---- a/tools/firmware/hvmloader/32bitbios_support.c
-+++ b/tools/firmware/hvmloader/32bitbios_support.c
-@@ -20,7 +20,7 @@
- * this program; If not, see <http://www.gnu.org/licenses/>.
- */
-
--#include <inttypes.h>
-+#include <stdint.h>
- #include <elf.h>
- #ifdef __sun__
- #include <sys/machelf.h>
---
-2.25.1
-
diff --git a/recipes-extended/xen/xen-tools_4.14.bb b/recipes-extended/xen/xen-tools_4.14.bb
deleted file mode 100644
index 9d78e44..0000000
--- a/recipes-extended/xen/xen-tools_4.14.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-# 4.14.3 release SHA
-SRCREV ?= "9f2b6c5ec2ded4c1caf149743e862c5f15d6d083"
-
-XEN_REL ?= "4.14"
-XEN_BRANCH ?= "stable-${XEN_REL}"
-
-SRC_URI = " \
- git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
- file://0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch \
- file://0001-firmware-provide-a-stand-alone-set-of-headers-Xen-4.14.patch \
- file://0001-tools-firmware-Build-firmware-as-ffreestanding-Xen-4.14.patch \
- "
-
-LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
-
-PV = "${XEN_REL}+stable${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-require xen.inc
-require xen-tools.inc
diff --git a/recipes-extended/xen/xen_4.14.bb b/recipes-extended/xen/xen_4.14.bb
deleted file mode 100644
index 267db16..0000000
--- a/recipes-extended/xen/xen_4.14.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-# 4.14.3 release SHA
-SRCREV ?= "9f2b6c5ec2ded4c1caf149743e862c5f15d6d083"
-
-XEN_REL ?= "4.14"
-XEN_BRANCH ?= "stable-${XEN_REL}"
-
-SRC_URI = " \
- git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
- file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
- "
-
-LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
-
-PV = "${XEN_REL}+stable${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-require xen.inc
-require xen-hypervisor.inc
--
2.25.1


[PATCH v2 2/3] xen: Add recipes for stable Xen 4.16 release and update master

Michal Orzel
 

Add recipes for Xen 4.16 release as, according to the documentation
we shall have recipes for the latest stable major version of Xen
before the next Yocto release. Bump PREFERED_VERSION to 4.16 as well.

Take the opportunity to update SRCREV of xen recipes for master
and bump XEN_REL version to 4.17 as this is the current development
version.

Signed-off-by: Michal Orzel <michal.orzel@...>
Reviewed-by: Christopher Clark <christopher.w.clark@...>
Reviewed-by: Bertrand Marquis <bertrand.marquis@...>
---
Changes since v1:
-update SRCREV of 4.16 recipes to 4.16.1 as it was released a few days ag=
o
---
.../include/meta-virt-default-versions.inc | 4 ++--
recipes-extended/xen/xen-tools_4.16.bb | 19 +++++++++++++++++++
recipes-extended/xen/xen-tools_git.bb | 6 +++---
recipes-extended/xen/xen_4.16.bb | 19 +++++++++++++++++++
recipes-extended/xen/xen_git.bb | 6 +++---
5 files changed, 46 insertions(+), 8 deletions(-)
create mode 100644 recipes-extended/xen/xen-tools_4.16.bb
create mode 100644 recipes-extended/xen/xen_4.16.bb

diff --git a/conf/distro/include/meta-virt-default-versions.inc b/conf/di=
stro/include/meta-virt-default-versions.inc
index 8a2db70..b2ce021 100644
--- a/conf/distro/include/meta-virt-default-versions.inc
+++ b/conf/distro/include/meta-virt-default-versions.inc
@@ -1,4 +1,4 @@
# Meta-virtuailization PREFERED_VERSION
=20
-PREFERRED_VERSION_xen ?=3D "4.15+stable%"
-PREFERRED_VERSION_xen-tools ?=3D "4.15+stable%"
+PREFERRED_VERSION_xen ?=3D "4.16+stable%"
+PREFERRED_VERSION_xen-tools ?=3D "4.16+stable%"
diff --git a/recipes-extended/xen/xen-tools_4.16.bb b/recipes-extended/xe=
n/xen-tools_4.16.bb
new file mode 100644
index 0000000..ae1ae8a
--- /dev/null
+++ b/recipes-extended/xen/xen-tools_4.16.bb
@@ -0,0 +1,19 @@
+# xen 4.16.1 release sha
+SRCREV ?=3D "f26544492298cb82d66f9bf36e29d2f75b3133f2"
+
+XEN_REL ?=3D "4.16"
+XEN_BRANCH ?=3D "stable-${XEN_REL}"
+
+SRC_URI =3D " \
+ git://xenbits.xen.org/xen.git;branch=3D${XEN_BRANCH} \
+ file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
+ "
+
+LIC_FILES_CHKSUM ?=3D "file://COPYING;md5=3D419739e325a50f3d7b4501338e44=
a4e5"
+
+PV =3D "${XEN_REL}+stable${SRCPV}"
+
+S =3D "${WORKDIR}/git"
+
+require xen.inc
+require xen-tools.inc
diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen=
/xen-tools_git.bb
index e733f1d..a450a7d 100644
--- a/recipes-extended/xen/xen-tools_git.bb
+++ b/recipes-extended/xen/xen-tools_git.bb
@@ -1,7 +1,7 @@
-# master status on 2022-03-08
-SRCREV ?=3D "9d4a44380d273de22d5753883cbf5581795ff24d"
+# master status on 2022-04-05
+SRCREV ?=3D "14dd241aad8af447680ac73e8579990e2c09c1e7"
=20
-XEN_REL ?=3D "4.16"
+XEN_REL ?=3D "4.17"
XEN_BRANCH ?=3D "master"
=20
SRC_URI =3D " \
diff --git a/recipes-extended/xen/xen_4.16.bb b/recipes-extended/xen/xen_=
4.16.bb
new file mode 100644
index 0000000..986484a
--- /dev/null
+++ b/recipes-extended/xen/xen_4.16.bb
@@ -0,0 +1,19 @@
+# xen 4.16.1 release sha
+SRCREV ?=3D "f26544492298cb82d66f9bf36e29d2f75b3133f2"
+
+XEN_REL ?=3D "4.16"
+XEN_BRANCH ?=3D "stable-${XEN_REL}"
+
+SRC_URI =3D " \
+ git://xenbits.xen.org/xen.git;branch=3D${XEN_BRANCH} \
+ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-loca=
tion.patch \
+ "
+
+LIC_FILES_CHKSUM ?=3D "file://COPYING;md5=3D419739e325a50f3d7b4501338e44=
a4e5"
+
+PV =3D "${XEN_REL}+stable${SRCPV}"
+
+S =3D "${WORKDIR}/git"
+
+require xen.inc
+require xen-hypervisor.inc
diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_g=
it.bb
index 2fbfb54..ebd1b76 100644
--- a/recipes-extended/xen/xen_git.bb
+++ b/recipes-extended/xen/xen_git.bb
@@ -1,7 +1,7 @@
-# master status on 2022-03-08
-SRCREV ?=3D "9d4a44380d273de22d5753883cbf5581795ff24d"
+# master status on 2022-04-05
+SRCREV ?=3D "14dd241aad8af447680ac73e8579990e2c09c1e7"
=20
-XEN_REL ?=3D "4.16"
+XEN_REL ?=3D "4.17"
XEN_BRANCH ?=3D "master"
=20
SRC_URI =3D " \
--=20
2.25.1


[PATCH v2 1/3] xen: Bump SRCREV of 4.15 recipes to 4.15.2

Michal Orzel
 

Bump SRCREV version of xen recipes to use the latest 4.15 release
which is 4.15.2.

Signed-off-by: Michal Orzel <michal.orzel@...>
Reviewed-by: Christopher Clark <christopher.w.clark@...>
Reviewed-by: Bertrand Marquis <bertrand.marquis@...>
---
Changes since v1:
-none
---
recipes-extended/xen/xen-tools_4.15.bb | 4 ++--
recipes-extended/xen/xen_4.15.bb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-extended/xen/xen-tools_4.15.bb b/recipes-extended/xe=
n/xen-tools_4.15.bb
index 840f162..5592dd7 100644
--- a/recipes-extended/xen/xen-tools_4.15.bb
+++ b/recipes-extended/xen/xen-tools_4.15.bb
@@ -1,5 +1,5 @@
-# xen 4.15.1 release sha
-SRCREV ?=3D "84fa99099b920f7bcde8899e1a9b756078719d7d"
+# xen 4.15.2 release sha
+SRCREV ?=3D "32dcef072fb37d432fd45c7916383472f3fcbc5e"
=20
XEN_REL ?=3D "4.15"
XEN_BRANCH ?=3D "stable-${XEN_REL}"
diff --git a/recipes-extended/xen/xen_4.15.bb b/recipes-extended/xen/xen_=
4.15.bb
index 1b87ae8..41023b2 100644
--- a/recipes-extended/xen/xen_4.15.bb
+++ b/recipes-extended/xen/xen_4.15.bb
@@ -1,5 +1,5 @@
-# xen 4.15.1 release sha
-SRCREV ?=3D "84fa99099b920f7bcde8899e1a9b756078719d7d"
+# xen 4.15.2 release sha
+SRCREV ?=3D "32dcef072fb37d432fd45c7916383472f3fcbc5e"
=20
XEN_REL ?=3D "4.15"
XEN_BRANCH ?=3D "stable-${XEN_REL}"
--=20
2.25.1


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

Michal Orzel
 

Before the next Yocto release, Xen recipes need to be updated.
This patch series:
- updates 4.15 recipes (4.15.2)
- introduces 4.16 recipes (4.16.1)
- removes 4.14 recipes

v2 bumps SRCREV of 4.16 recipes to 4.16.1 as it was released a few days a=
go.
v2 adds R-by from Christopher and Bertrand to all the patches.

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 =3D> 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-st=
and-alone-set-of-headers-Xen-4.14.patch
delete mode 100644 recipes-extended/xen/files/0001-python-pygrub-pass-DI=
STUTILS-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 =3D> xen_4.16.bb} (79%)

--=20
2.25.1


[PATCH] openvswitch: uprev from v2.17.0-30-g2404d4536 to v2.17.1

He Zhe
 

commits short log:
41bb202fb (tag: v2.17.1) Set release date for 2.17.1.
8f42d4f59 NEWS: Highlight libopenvswitch API change caused by UB fixes.
14301b3a3 netdev-offload-tc: Check for ct_state flag combinations that are not offloadable.
3a2eef792 python: idl: Set cond_changed to true if condition change requested.
d05ccf288 dpif-netdev: Fix dp_netdev_get_pmd() function getting correct core_id.
79e291f98 alb.at: Add tests for cross-numa polling.
9c3b74fb2 dpif-netdev: Fix PMD auto load balance with pmd-rxq-isolate.
8580ff9dd pmd.at: Add tests for multi non-local numa pmds.
6bf4eeddb dpif-netdev: Fix non-local numa selection for more than two numas.
c41434b3b dpif-netdev: Fix typo in function name.
e0aa5e132 python: idl: Set cond_changed to false if last id is zero.
8da40d31c ofproto-dpif-xlate: Fix NULL pointer dereference in xlate_normal().
63a903ab4 ofproto/ofproto-dpif: Fix dpif_type for userspace tunnels.
14d54eb8b sset: add SHORT version of SAFE loop macros.
f0e63b115 sparse: bump recommended version and include headers.
70b87cf72 idlc: support short version of SAFE macros.
3777ed90c rculist: use multi-variable helpers for loop macros.
bb52e9beb hindex: remove the next variable in safe loops.
7d6cbfa24 hindex: use multi-variable iterators.
97ad96b63 cmap: use multi-variable iterators.
cd62fda22 hmap: use short version of safe loops if possible.
d56bfd752 hmap: implement UB-safe hmap pop iterator.
e2c835486 hmap: use multi-variable helpers for hmap loops.
897d6647e list: use short version of safe loops if possible.
979a9eb5b list: use multi-variable helpers for list loops.
6bacf802c util: add helpers to overload SAFE macro.
f127123d6 util: add safe multi-variable iterators.
38e73f0b6 util: add multi-variable loop iterator macros.
e91edf456 ovsdb: raft: Fix inability to read the database with DNS host names.

The ptest results BEFORE uprev:
ERROR: 2340 tests were run,
30 failed unexpectedly.
65 tests were skipped.
failed cases:
10 11 12 13 14 15 16 17 18 462 769 785 786 787 788 791 792 793 1024 1180 1181
1182 1183 1184 1185 1290 1291 2387 2391 2394

The ptest results AFTER uprev:
ERROR: 2343 tests were run,
30 failed unexpectedly.
65 tests were skipped.
failed cases:
10 11 12 13 14 15 16 17 18 462 769 785 786 787 788 791 792 793 1025 1183 1184
1185 1186 1187 1188 1293 1294 2390 2394 2397

Signed-off-by: He Zhe <zhe.he@...>
---
recipes-networking/openvswitch/openvswitch_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
index 7051ac5c..2e125e78 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -14,12 +14,12 @@ RDEPENDS:${PN}-ptest += "\
"

S = "${WORKDIR}/git"
-PV = "2.17.0+${SRCPV}"
-CVE_VERSION = "2.17.0"
+PV = "2.17.1+${SRCPV}"
+CVE_VERSION = "2.17.1"

FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:"

-SRCREV = "2404d45367d104e74cc9eea50d27dcaa8c8917c0"
+SRCREV = "41bb202fb37f184b0a8820a029c62d03c118614e"
SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-2.17 \
file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \
file://run-ptest \
--
2.25.1


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

Christopher Clark
 

On Thu, Apr 14, 2022 at 1:40 PM Bruce Ashfield <bruce.ashfield@...> wrote:

On Thu, Apr 14, 2022 at 4:02 AM Bertrand Marquis
<bertrand.marquis@...> wrote:

Hi Bruce,

On 14 Apr 2022, at 04:13, Bruce Ashfield <bruce.ashfield@...> wrote:

On Fri, Apr 8, 2022 at 4:44 AM Michal Orzel <michal.orzel@...> 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
FYI: I'm not ignoring these, and I will make sure they get into the
upcoming release branch and are in place for the LTS release. I'm just
waiting until Christopher gets a chance to review and see if these
match up with what he was thinking about for versions.
Thanks.
Thanks for your patience on these. I've just completed the build, boot
and XTF testing of this series with success, for x86-64, arm32 and
arm64 qemu MACHINES, with each of the three Xen versions (4.15.2,
4.16.1 and 4.17 git recipe).

I modified the 4.16 recipe to apply the Xen 4.16.1 release revision as
Bertrand indicated and Bruce has confirmed as wanted.
ie: SRCREV ?= "f26544492298cb82d66f9bf36e29d2f75b3133f2"
I also think the SRCREV revision posted for the git recipes update to
4.17 is a sensible choice.

For this series, with the update to 4.16.1 applied:
Reviewed-by: Christopher Clark <christopher.w.clark@...>

For LTS, I think we said the strategy should be a bit different:
- keep the original versions and update them.
- keep the same default version
- add/update other recipe upon request
My fault for not being clear, I was thinking about "the upcoming LTS",
aka the very-soon to be released kirstone .. but just typed "LTS",
which is no longer unambiguous!

Unless you were also speaking about kirstone .. :)

For dunfell-LTS, we definitely don't need to add new versions, but I'm
happy to do updates.

For Kirstone LTS, I just wanted to make sure that we had the right Xen
versions, where at least one is also a Xen LTS and another version to
track a latest release (for those that need it).

I think we are aligned on both fronts.
Ack. ie. for Kirkstone, I think it is:
- the 4.16 recipes will be default (as per the change in this series)
and that will stay default
- the git recipes will be there and those can be updated to add
packaging compatibility with newer Xen updates if requested
- there's a good case for keeping the 4.15 release recipes included
given the timing of this update and the Kirkstone release
- and we can add recipes for a newer Xen stable version upon request

thanks,

Christopher


Bruce

I do not think we need to push this change to LTS branch, there it might make more sense to update the present versions.
I can check that in the next weeks.

Cheers
Bertrand


Bruce


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




--
- 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] nerdctl: upgrade to v0.18.0

Chen Qi
 

Thanks Bruce. Looking forward to your tool.

Regards,
Qi

-----Original Message-----
From: Bruce Ashfield <bruce.ashfield@...>
Sent: Monday, April 18, 2022 9:44 PM
To: Chen, Qi <Qi.Chen@...>
Cc: meta-virtualization@...
Subject: Re: [meta-virtualization][PATCH] nerdctl: upgrade to v0.18.0

As I mentioned earlier, I have a WIP progress version bump that I'm
testing the script/tool against.

I'll keep this as a reference, and will follow up with the delta
between what I end up with, and this.

Bruce

On Mon, Apr 18, 2022 at 6:46 AM Chen Qi <Qi.Chen@...> wrote:

Signed-off-by: Chen Qi <Qi.Chen@...>
---
.../nerdctl/nerdctl/modules.txt | 72 +++---
recipes-containers/nerdctl/nerdctl_git.bb | 205 +++++++++---------
2 files changed, 137 insertions(+), 140 deletions(-)

diff --git a/recipes-containers/nerdctl/nerdctl/modules.txt b/recipes-containers/nerdctl/nerdctl/modules.txt
index 3b144736..5f90f206 100644
--- a/recipes-containers/nerdctl/nerdctl/modules.txt
+++ b/recipes-containers/nerdctl/nerdctl/modules.txt
@@ -1,36 +1,38 @@
+# github.com/Masterminds/semver/v3 v3.1.1
+## explicit
# github.com/Microsoft/go-winio v0.5.2
## explicit
-# github.com/compose-spec/compose-go v1.0.9
+# github.com/compose-spec/compose-go v1.1.0
## explicit
# github.com/containerd/cgroups v1.0.3
## explicit
# github.com/containerd/console v1.0.3
## explicit
-# github.com/containerd/containerd v1.6.0
+# github.com/containerd/containerd v1.6.2
## explicit
# github.com/containerd/continuity v0.2.2
## explicit
-# github.com/containerd/go-cni v1.1.3
+# github.com/containerd/go-cni v1.1.4
## explicit
-# github.com/containerd/imgcrypt v1.1.3
+# github.com/containerd/imgcrypt v1.1.4
## explicit
-# github.com/containerd/stargz-snapshotter v0.11.0
+# github.com/containerd/stargz-snapshotter v0.11.3
## explicit
-# github.com/containerd/stargz-snapshotter/estargz v0.11.0
+# github.com/containerd/stargz-snapshotter/estargz v0.11.3
## explicit
-# github.com/containerd/stargz-snapshotter/ipfs v0.11.0
+# github.com/containerd/stargz-snapshotter/ipfs v0.11.3
## explicit
# github.com/containerd/typeurl v1.0.2
## explicit
# github.com/containernetworking/cni v1.0.1
## explicit
-# github.com/containernetworking/plugins v1.0.1
+# github.com/containernetworking/plugins v1.1.1
## explicit
# github.com/cyphar/filepath-securejoin v0.2.3
## explicit
-# github.com/docker/cli v20.10.12+incompatible
+# github.com/docker/cli v20.10.14+incompatible
## explicit
-# github.com/docker/docker v20.10.12+incompatible
+# github.com/docker/docker v20.10.14+incompatible
## explicit
# github.com/docker/go-connections v0.4.0
## explicit
@@ -48,9 +50,7 @@
## explicit
# github.com/ipfs/go-ipfs-http-client v0.2.0
## explicit
-# github.com/ipfs/interface-go-ipfs-core v0.5.2
-## explicit
-# github.com/jaytaylor/go-hostsfile v0.0.0-20211120191712-f53f85d8b98f
+# github.com/ipfs/interface-go-ipfs-core v0.6.1
## explicit
# github.com/mattn/go-isatty v0.0.14
## explicit
@@ -60,35 +60,35 @@
## explicit
# github.com/opencontainers/go-digest v1.0.0
## explicit
-# github.com/opencontainers/image-spec v1.0.3-0.20211215212317-ea0209f50ae1
+# github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1
## explicit
-# github.com/opencontainers/runtime-spec v1.0.3-0.20211214071223-8958f93039ab
+# github.com/opencontainers/runtime-spec v1.0.3-0.20220311020903-6969a0a09ab1
## explicit
# github.com/pelletier/go-toml v1.9.4
## explicit
-# github.com/rootless-containers/bypass4netns v0.1.1-0.20220214050838-562b4845f47e
+# github.com/rootless-containers/bypass4netns v0.2.2
## explicit
-# github.com/rootless-containers/rootlesskit v0.14.6
+# github.com/rootless-containers/rootlesskit v1.0.0
## explicit
# github.com/sirupsen/logrus v1.8.1
## explicit
-# github.com/spf13/cobra v1.3.0
+# github.com/spf13/cobra v1.4.0
## explicit
# github.com/spf13/pflag v1.0.5
## explicit
# github.com/tidwall/gjson v1.14.0
## explicit
-# github.com/vishvananda/netlink v1.1.1-0.20220125195016-0639e7e787ba
+# github.com/vishvananda/netlink v1.1.1-0.20220318152240-083e92e21eeb
## explicit
# github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74
## explicit
-# golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
+# golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064
## explicit
-# golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
+# golang.org/x/net v0.0.0-20220225172249-27dd8689420f
## explicit
# golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
## explicit
-# golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27
+# golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8
## explicit
# golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
## explicit
@@ -112,7 +112,7 @@
## explicit
# github.com/containerd/ttrpc v1.1.0
## explicit
-# github.com/containers/ocicrypt v1.1.2
+# github.com/containers/ocicrypt v1.1.3
## explicit
# github.com/coreos/go-systemd/v22 v22.3.2
## explicit
@@ -156,31 +156,31 @@
## explicit
# github.com/ipfs/go-block-format v0.0.3
## explicit
-# github.com/ipfs/go-blockservice v0.1.7
+# github.com/ipfs/go-blockservice v0.3.0
## explicit
-# github.com/ipfs/go-datastore v0.4.5
+# github.com/ipfs/go-datastore v0.5.0
## explicit
-# github.com/ipfs/go-ipfs-blockstore v0.1.6
+# github.com/ipfs/go-ipfs-blockstore v1.2.0
## explicit
# github.com/ipfs/go-ipfs-cmds v0.6.0
## explicit
-# github.com/ipfs/go-ipfs-ds-help v0.1.1
+# github.com/ipfs/go-ipfs-ds-help v1.1.0
## explicit
-# github.com/ipfs/go-ipfs-exchange-interface v0.0.1
+# github.com/ipfs/go-ipfs-exchange-interface v0.1.0
## explicit
# github.com/ipfs/go-ipfs-util v0.0.2
## explicit
# github.com/ipfs/go-ipld-cbor v0.0.5
## explicit
-# github.com/ipfs/go-ipld-format v0.2.0
+# github.com/ipfs/go-ipld-format v0.3.0
## explicit
# github.com/ipfs/go-ipld-legacy v0.1.0
## explicit
# github.com/ipfs/go-log v1.0.5
## explicit
-# github.com/ipfs/go-log/v2 v2.1.3
+# github.com/ipfs/go-log/v2 v2.3.0
## explicit
-# github.com/ipfs/go-merkledag v0.4.0
+# github.com/ipfs/go-merkledag v0.6.0
## explicit
# github.com/ipfs/go-metrics-interface v0.0.1
## explicit
@@ -196,7 +196,7 @@
## explicit
# github.com/jbenet/goprocess v0.1.4
## explicit
-# github.com/klauspost/compress v1.14.2
+# github.com/klauspost/compress v1.15.1
## explicit
# github.com/klauspost/cpuid/v2 v2.0.6
## explicit
@@ -212,7 +212,7 @@
## explicit
# github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369
## explicit
-# github.com/miekg/pkcs11 v1.0.3
+# github.com/miekg/pkcs11 v1.1.1
## explicit
# github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
## explicit
@@ -254,7 +254,7 @@
## explicit
# github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e
## explicit
-# github.com/prometheus/client_golang v1.12.0
+# github.com/prometheus/client_golang v1.12.1
## explicit
# github.com/prometheus/client_model v0.2.0
## explicit
@@ -302,7 +302,7 @@
## explicit
# google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350
## explicit
-# google.golang.org/grpc v1.44.0
+# google.golang.org/grpc v1.45.0
## explicit
# google.golang.org/protobuf v1.27.1
## explicit
@@ -310,4 +310,4 @@
## explicit
# github.com/ktock/golang-lru v0.5.5-0.20211029085301-ec551be6f75c
## explicit
-# github.com/hashicorp/golang-lru => github.com/ktock/golang-lru v0.5.5-0.20211029085301-ec551be6f75c
+# github.com/hashicorp/golang-lru => github.com/ktock/golang-lru v0.5.5-0.20211029085301-ec551be6f75c
diff --git a/recipes-containers/nerdctl/nerdctl_git.bb b/recipes-containers/nerdctl/nerdctl_git.bb
index e0e87de4..c402c578 100644
--- a/recipes-containers/nerdctl/nerdctl_git.bb
+++ b/recipes-containers/nerdctl/nerdctl_git.bb
@@ -9,19 +9,23 @@ DEPENDS = " \
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
"

-#SRCREV_FORMAT="nerdcli_cgroups"
-SRCREV_nerdcli = "f2427ffbd1dd67231722fb307f39eecf702de980"
+SRCREV_nerdcli = "77276ff0fffad3f855ab9f2f5a4ad5527ef76485"

SRC_URI = "git://github.com/containerd/nerdctl.git;name=nerdcli;branch=master;protocol=https"

+# github.com/Masterminds/semver/v3 v3.1.1
+# [1] git ls-remote https://github.com/Masterminds/semver/v3 v3.1.1
+SRCREV_semver="d387ce7889a157b19ad7694dba39a562051f41b0"
+SRC_URI += "git://github.com/Masterminds/semver;name=semver;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/Masterminds/semver/v3"
+
# github.com/Microsoft/go-winio v0.5.2
# [1] git ls-remote https://github.com/Microsoft/go-winio dfd7da8f92a382999d77b5d9cfe8cc6bec1894c6
SRCREV_go-winio="dfd7da8f92a382999d77b5d9cfe8cc6bec1894c6"
SRC_URI += "git://github.com/Microsoft/go-winio;name=go-winio;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/Microsoft/go-winio"

-# github.com/compose-spec/compose-go v1.0.9
-# [1] git ls-remote https://github.com/compose-spec/compose-go ad7931673da9b06dd2a326d91a2ab015d62a31d8
-SRCREV_compose-go="ad7931673da9b06dd2a326d91a2ab015d62a31d8"
+# github.com/compose-spec/compose-go v1.1.0
+# [1] git ls-remote https://github.com/compose-spec/compose-go 8c0547c394378beefe7100ffd419b476fb99eb60
+SRCREV_compose-go="8c0547c394378beefe7100ffd419b476fb99eb60"
SRC_URI += "git://github.com/compose-spec/compose-go;name=compose-go;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/compose-spec/compose-go"

# github.com/containerd/cgroups v1.0.3
@@ -34,9 +38,9 @@ SRC_URI += "git://github.com/containerd/cgroups;name=cgroups;protocol=https;nobr
SRCREV_console="060a791de16aeb90b3bb4dcd78dfec3ca45fa5df"
SRC_URI += "git://github.com/containerd/console;name=console;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/console"

-# github.com/containerd/containerd v1.6.0
-# [1] git ls-remote https://github.com/containerd/containerd 13a9d2087b04c1a99ba3fb3159fbd6b2493ca6dd
-SRCREV_containerd="13a9d2087b04c1a99ba3fb3159fbd6b2493ca6dd"
+# github.com/containerd/containerd v1.6.2
+# [1] git ls-remote https://github.com/containerd/containerd v1.6.2
+SRCREV_containerd = "b30221197bbf818a48ec3f20f5e72a739f84ebeb"
SRC_URI += "git://github.com/containerd/containerd;name=containerd;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/containerd"

# github.com/containerd/continuity v0.2.2
@@ -44,19 +48,19 @@ SRC_URI += "git://github.com/containerd/containerd;name=containerd;protocol=http
SRCREV_continuity="3a5e5b882aed17b35e1cea5bbc0a4c26b40ab268"
SRC_URI += "git://github.com/containerd/continuity;name=continuity;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/continuity"

-# github.com/containerd/go-cni v1.1.3
-# [1] git ls-remote https://github.com/containerd/go-cni d3dcbd535b9e305167e3d27e1b8cd7bbd4c3c382
-SRCREV_go-cni="d3dcbd535b9e305167e3d27e1b8cd7bbd4c3c382"
+# github.com/containerd/go-cni v1.1.4
+# [1] git ls-remote https://github.com/containerd/go-cni v1.1.4
+SRCREV_go-cni = "1ae42404d2502e705c1c61de9c254a7cd7f6e74b"
SRC_URI += "git://github.com/containerd/go-cni;name=go-cni;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/go-cni"

-# github.com/containerd/imgcrypt v1.1.3
-# [1] git ls-remote https://github.com/containerd/imgcrypt 41198ab93e7616c40a1ed505256a664b81fe84c1
-SRCREV_imgcrypt="41198ab93e7616c40a1ed505256a664b81fe84c1"
+# github.com/containerd/imgcrypt v1.1.4
+# [1] git ls-remote https://github.com/containerd/imgcrypt v1.1.4
+SRCREV_imgcrypt = "7931b2f099de27afc80e84df85f9361ee6668dd1"
SRC_URI += "git://github.com/containerd/imgcrypt;name=imgcrypt;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/imgcrypt"

-# github.com/containerd/stargz-snapshotter v0.11.0
-# [1] git ls-remote https://github.com/containerd/stargz-snapshotter 7216b07a2f8f0ec3ec1fb8c6ac8a933c70b82eec
-SRCREV_stargz-snapshotter="7216b07a2f8f0ec3ec1fb8c6ac8a933c70b82eec"
+# github.com/containerd/stargz-snapshotter v0.11.3
+# [1] git ls-remote https://github.com/containerd/stargz-snapshotter v0.11.3
+SRCREV_stargz-snapshotter = "84c8e540467f8701fbf1ba7fb9fce749fdbaf160"
SRC_URI += "git://github.com/containerd/stargz-snapshotter;name=stargz-snapshotter;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/stargz-snapshotter"

# github.com/containerd/typeurl v1.0.2
@@ -69,9 +73,9 @@ SRC_URI += "git://github.com/containerd/typeurl;name=typeurl;protocol=https;nobr
SRCREV_cni="1694fd7b57e0176a98a12823a5ffc03337fdc152"
SRC_URI += "git://github.com/containernetworking/cni;name=cni;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containernetworking/cni"

-# github.com/containernetworking/plugins v1.0.1
-# [1] git ls-remote https://github.com/containernetworking/plugins 56d8364f1bd3fa0d35717936ec5cd385e61d3815
-SRCREV_plugins="56d8364f1bd3fa0d35717936ec5cd385e61d3815"
+# github.com/containernetworking/plugins v1.1.1
+# [1] git ls-remote https://github.com/containernetworking/plugins v1.1.1
+SRCREV_plugins = "587d42b2ca2b8fb2f111b50fd90f0089cc03b8ad"
SRC_URI += "git://github.com/containernetworking/plugins;name=plugins;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containernetworking/plugins"

# github.com/cyphar/filepath-securejoin v0.2.3
@@ -79,14 +83,14 @@ SRC_URI += "git://github.com/containernetworking/plugins;name=plugins;protocol=h
SRCREV_filepath-securejoin="a89baba1e4f44c5512e245cbd156de1293d6185a"
SRC_URI += "git://github.com/cyphar/filepath-securejoin;name=filepath-securejoin;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/cyphar/filepath-securejoin"

-# github.com/docker/cli v20.10.12+incompatible
-# [1] git ls-remote https://github.com/docker/cli 60293e390eba4de1a06309b75bbf61dd7a45bbcb
-SRCREV_cli="60293e390eba4de1a06309b75bbf61dd7a45bbcb"
+# github.com/docker/cli v20.10.14+incompatible
+# [1] git ls-remote https://github.com/docker/cli v20.10.14
+SRCREV_cli="0a7772e9b73210a9c25df0d1d74a6566b5e410eb"
SRC_URI += "git://github.com/docker/cli;name=cli;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/docker/cli"

# github.com/docker/docker v20.10.12+incompatible
-# [1] git ls-remote https://github.com/docker/docker bd6d47cb470e2c31acaef7dc0da42dc8cfb42085
-SRCREV_docker="bd6d47cb470e2c31acaef7dc0da42dc8cfb42085"
+# [1] git ls-remote https://github.com/docker/docker v20.10.14
+SRCREV_docker="0ea83a3744846f1b998016406c457c3d6c68c7a6"
SRC_URI += "git://github.com/docker/docker;name=docker;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/docker/docker"

# github.com/docker/go-connections v0.4.0
@@ -129,16 +133,11 @@ SRC_URI += "git://github.com/ipfs/go-ipfs-files;name=go-ipfs-files;protocol=http
SRCREV_go-ipfs-http-client="434ac969c653f7c4781144aaa2834b5f8828ce22"
SRC_URI += "git://github.com/ipfs/go-ipfs-http-client;name=go-ipfs-http-client;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipfs-http-client"

-# github.com/ipfs/interface-go-ipfs-core v0.5.2
-# [1] git ls-remote https://github.com/ipfs/interface-go-ipfs-core 275b80e1f34ead0fb06a9216e3bffee57a01b636
-SRCREV_interface-go-ipfs-core="275b80e1f34ead0fb06a9216e3bffee57a01b636"
+# github.com/ipfs/interface-go-ipfs-core v0.6.1
+# [1] git ls-remote https://github.com/ipfs/interface-go-ipfs-core v0.6.1
+SRCREV_interface-go-ipfs-core = "d61758a39392e9853a304189a26c3e546e00ee3a"
SRC_URI += "git://github.com/ipfs/interface-go-ipfs-core;name=interface-go-ipfs-core;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/interface-go-ipfs-core"

-# github.com/jaytaylor/go-hostsfile v0.0.0-20211120191712-f53f85d8b98f
-# [1] git ls-remote https://github.com/jaytaylor/go-hostsfile f53f85d8b98f8f4925bceab7890a431e2f46c38f
-SRCREV_go-hostsfile="f53f85d8b98f8f4925bceab7890a431e2f46c38f"
-SRC_URI += "git://github.com/jaytaylor/go-hostsfile;name=go-hostsfile;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/jaytaylor/go-hostsfile"
-
# github.com/mattn/go-isatty v0.0.14
# [1] git ls-remote https://github.com/mattn/go-isatty 504425e14f742f1f517c4586048b49b37f829c8e
SRCREV_go-isatty="504425e14f742f1f517c4586048b49b37f829c8e"
@@ -159,14 +158,14 @@ SRC_URI += "git://github.com/multiformats/go-multiaddr;name=go-multiaddr;protoco
SRCREV_go-digest="4a41a1fddd8208cc64f911e551a7f361716f8ae5"
SRC_URI += "git://github.com/opencontainers/go-digest;name=go-digest;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/opencontainers/go-digest"

-# github.com/opencontainers/image-spec v1.0.3-0.20211215212317-ea0209f50ae1
-# [1] git ls-remote https://github.com/opencontainers/image-spec ea0209f50ae1a3707cff054cdb6b7487050487de
-SRCREV_image-spec="ea0209f50ae1a3707cff054cdb6b7487050487de"
+# github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1
+# [1] git ls-remote https://github.com/opencontainers/image-spec 02efb9a75ee11e05937b535cc5f228f9343ab2f5
+SRCREV_image-spec="02efb9a75ee11e05937b535cc5f228f9343ab2f5"
SRC_URI += "git://github.com/opencontainers/image-spec;name=image-spec;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/opencontainers/image-spec"

-# github.com/opencontainers/runtime-spec v1.0.3-0.20211214071223-8958f93039ab
-# [1] git ls-remote https://github.com/opencontainers/runtime-spec 8958f93039ab90be53d803cd7e231a775f644451
-SRCREV_runtime-spec="8958f93039ab90be53d803cd7e231a775f644451"
+# github.com/opencontainers/runtime-spec v1.0.3-0.20220311020903-6969a0a09ab1
+# [1] git ls-remote https://github.com/opencontainers/runtime-spec 6969a0a09ab162a574cafcc9ac814e498962c943
+SRCREV_runtime-spec="6969a0a09ab162a574cafcc9ac814e498962c943"
SRC_URI += "git://github.com/opencontainers/runtime-spec;name=runtime-spec;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/opencontainers/runtime-spec"

# github.com/pelletier/go-toml v1.9.4
@@ -174,14 +173,14 @@ SRC_URI += "git://github.com/opencontainers/runtime-spec;name=runtime-spec;proto
SRCREV_go-toml="b8ba995eaaba4be30c8a8090bdfb4aa61af52054"
SRC_URI += "git://github.com/pelletier/go-toml;name=go-toml;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/pelletier/go-toml"

-# github.com/rootless-containers/bypass4netns v0.1.1-0.20220214050838-562b4845f47e
-# [1] git ls-remote https://github.com/rootless-containers/bypass4netns 562b4845f47e3bb1019e37369948845a27ef5b58
-SRCREV_bypass4netns="562b4845f47e3bb1019e37369948845a27ef5b58"
+# github.com/rootless-containers/bypass4netns v0.2.2
+# [1] git ls-remote https://github.com/rootless-containers/bypass4netns c3682687bc69a704c4ca312ab61febe2606c9680
+SRCREV_bypass4netns="c3682687bc69a704c4ca312ab61febe2606c9680"
SRC_URI += "git://github.com/rootless-containers/bypass4netns;name=bypass4netns;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rootless-containers/bypass4netns"

-# github.com/rootless-containers/rootlesskit v0.14.6
-# [1] git ls-remote https://github.com/rootless-containers/rootlesskit 0f88c14fd0966e018bb8f0eefc57c5283459a56c
-SRCREV_rootlesskit="0f88c14fd0966e018bb8f0eefc57c5283459a56c"
+# github.com/rootless-containers/rootlesskit v1.0.0
+# [1] git ls-remote https://github.com/rootless-containers/rootlesskit v1.0.0
+SRCREV_rootlesskit = "4c5afdcdb381581c7eaaea09ac9cdf226b8dda03"
SRC_URI += "git://github.com/rootless-containers/rootlesskit;name=rootlesskit;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rootless-containers/rootlesskit"

# github.com/sirupsen/logrus v1.8.1
@@ -189,9 +188,9 @@ SRC_URI += "git://github.com/rootless-containers/rootlesskit;name=rootlesskit;pr
SRCREV_logrus="bdc0db8ead3853c56b7cd1ac2ba4e11b47d7da6b"
SRC_URI += "git://github.com/sirupsen/logrus;name=logrus;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/sirupsen/logrus"

-# github.com/spf13/cobra v1.3.0
-# [1] git ls-remote https://github.com/spf13/cobra 178edbb247f35e466578211dcf5f4892dbbd369b
-SRCREV_cobra="178edbb247f35e466578211dcf5f4892dbbd369b"
+# github.com/spf13/cobra v1.4.0
+# [1] git ls-remote https://github.com/spf13/cobra v1.4.0
+SRCREV_cobra = "5b2b9e9f61d36ccb66167301f76a2292c3729855"
SRC_URI += "git://github.com/spf13/cobra;name=cobra;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/spf13/cobra"

# github.com/spf13/pflag v1.0.5
@@ -204,9 +203,9 @@ SRC_URI += "git://github.com/spf13/pflag;name=pflag;protocol=https;nobranch=1;de
SRCREV_gjson="7a94820afd8a0d993c07b9cde761b95943823a9f"
SRC_URI += "git://github.com/tidwall/gjson;name=gjson;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tidwall/gjson"

-# github.com/vishvananda/netlink v1.1.1-0.20220125195016-0639e7e787ba
-# [1] git ls-remote https://github.com/vishvananda/netlink 0639e7e787ba7257fc7d097a14d203b1cf1fece9
-SRCREV_netlink="0639e7e787ba7257fc7d097a14d203b1cf1fece9"
+# github.com/vishvananda/netlink v1.1.1-0.20220318152240-083e92e21eeb
+# [1] git ls-remote https://github.com/vishvananda/netlink 083e92e21eebde7a218b0da26a7a1b27c9b5e0f0
+SRCREV_netlink="083e92e21eebde7a218b0da26a7a1b27c9b5e0f0"
SRC_URI += "git://github.com/vishvananda/netlink;name=netlink;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/vishvananda/netlink"

# github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74
@@ -214,14 +213,14 @@ SRC_URI += "git://github.com/vishvananda/netlink;name=netlink;protocol=https;nob
SRCREV_netns="50045581ed74c15eded78746bae9fb3df07d6655"
SRC_URI += "git://github.com/vishvananda/netns;name=netns;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/vishvananda/netns"

-# golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
-# [1] git ls-remote https://go.googlesource.com/crypto e495a2d5b3d3be43468d0ebb413f46eeaedf7eb3
-SRCREV_crypto="e495a2d5b3d3be43468d0ebb413f46eeaedf7eb3"
+# golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064
+# [1] git ls-remote https://go.googlesource.com/crypto 2c7772ba30643b7a2026cbea938420dce7c6384d
+SRCREV_crypto="2c7772ba30643b7a2026cbea938420dce7c6384d"
SRC_URI += "git://go.googlesource.com/crypto;name=crypto;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/crypto"

-# golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
-# [1] git ls-remote https://go.googlesource.com/net cd36cc0744dd695657988f15f08446dc81e16efc
-SRCREV_net="cd36cc0744dd695657988f15f08446dc81e16efc"
+# golang.org/x/net v0.0.0-20220225172249-27dd8689420f
+# [1] git ls-remote https://go.googlesource.com/net 27dd8689420fcde088514397d015e4fea5174e0e
+SRCREV_net="27dd8689420fcde088514397d015e4fea5174e0e"
SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/net"

# golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
@@ -229,9 +228,9 @@ SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;des
SRCREV_sync="036812b2e83c0ddf193dd5a34e034151da389d09"
SRC_URI += "git://go.googlesource.com/sync;name=sync;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/sync"

-# golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27
-# [1] git ls-remote https://go.googlesource.com/sys 99c3d69c2c27d4f16bc6cb2698ad877a3ba5fe75
-SRCREV_sys="99c3d69c2c27d4f16bc6cb2698ad877a3ba5fe75"
+# golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8
+# [1] git ls-remote https://go.googlesource.com/sys a9b59b0215f867c0675d50602208ab8c4f4fe9c7
+SRCREV_sys="a9b59b0215f867c0675d50602208ab8c4f4fe9c7"
SRC_URI += "git://go.googlesource.com/sys;name=sys;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/sys"

# golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
@@ -289,9 +288,9 @@ SRC_URI += "git://github.com/containerd/fifo;name=fifo;protocol=https;nobranch=1
SRCREV_ttrpc="5e8fe05f04c91bc8713ee4241e58d0b9da1c4a59"
SRC_URI += "git://github.com/containerd/ttrpc;name=ttrpc;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/ttrpc"

-# github.com/containers/ocicrypt v1.1.2
-# [1] git ls-remote https://github.com/containers/ocicrypt 1272152ccae67a2c3a4ed543d72b7e42928c99bb
-SRCREV_ocicrypt="1272152ccae67a2c3a4ed543d72b7e42928c99bb"
+# github.com/containers/ocicrypt v1.1.3
+# [1] git ls-remote https://github.com/containers/ocicrypt v1.1.3
+SRCREV_ocicrypt = "01e7d427cd74fec566a69393e3de805df382f77c"
SRC_URI += "git://github.com/containers/ocicrypt;name=ocicrypt;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containers/ocicrypt"

# github.com/coreos/go-systemd/v22 v22.3.2
@@ -399,19 +398,19 @@ SRC_URI += "git://github.com/ipfs/bbloom;name=bbloom;protocol=https;nobranch=1;d
SRCREV_go-block-format="b30b45004baf0d2dcd3d1b5b5604fb4c0ccb0825"
SRC_URI += "git://github.com/ipfs/go-block-format;name=go-block-format;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-block-format"

-# github.com/ipfs/go-blockservice v0.1.7
-# [1] git ls-remote https://github.com/ipfs/go-blockservice 7e86180be5c2959033db973c0eae033de03dd423
-SRCREV_go-blockservice="7e86180be5c2959033db973c0eae033de03dd423"
+# github.com/ipfs/go-blockservice v0.3.0
+# [1] git ls-remote https://github.com/ipfs/go-blockservice v0.3.0
+SRCREV_go-blockservice = "888c7cc7c29cf4752865ce2e856237cb1d5c85b2"
SRC_URI += "git://github.com/ipfs/go-blockservice;name=go-blockservice;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-blockservice"

-# github.com/ipfs/go-datastore v0.4.5
-# [1] git ls-remote https://github.com/ipfs/go-datastore 73ce3192124c5781bc875f2e5d4f483ab8de0d04
-SRCREV_go-datastore="73ce3192124c5781bc875f2e5d4f483ab8de0d04"
+# github.com/ipfs/go-datastore v0.5.0
+# [1] git ls-remote https://github.com/ipfs/go-datastore v0.5.0
+SRCREV_go-datastore = "7548998537794105418980aeb5dac19802712392"
SRC_URI += "git://github.com/ipfs/go-datastore;name=go-datastore;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-datastore"

-# github.com/ipfs/go-ipfs-blockstore v0.1.6
-# [1] git ls-remote https://github.com/ipfs/go-ipfs-blockstore 95a1a08b33f8e55a45a4c306f6f05cf91e8f0728
-SRCREV_go-ipfs-blockstore="95a1a08b33f8e55a45a4c306f6f05cf91e8f0728"
+# github.com/ipfs/go-ipfs-blockstore v1.2.0
+# [1] git ls-remote https://github.com/ipfs/go-ipfs-blockstore v1.2.0
+SRCREV_go-ipfs-blockstore = "ffd43a8d91e6ee80b26d3a6eca5b8c4816c5508b"
SRC_URI += "git://github.com/ipfs/go-ipfs-blockstore;name=go-ipfs-blockstore;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipfs-blockstore"

# github.com/ipfs/go-ipfs-cmds v0.6.0
@@ -419,14 +418,14 @@ SRC_URI += "git://github.com/ipfs/go-ipfs-blockstore;name=go-ipfs-blockstore;pro
SRCREV_go-ipfs-cmds="4ade007405e5d3befb14184290576c63cc43a6a3"
SRC_URI += "git://github.com/ipfs/go-ipfs-cmds;name=go-ipfs-cmds;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipfs-cmds"

-# github.com/ipfs/go-ipfs-ds-help v0.1.1
-# [1] git ls-remote https://github.com/ipfs/go-ipfs-ds-help 48b9cc210923d23b39582b5fa6670ed0d08dc2af
-SRCREV_go-ipfs-ds-help="48b9cc210923d23b39582b5fa6670ed0d08dc2af"
+# github.com/ipfs/go-ipfs-ds-help v1.1.0
+# [1] git ls-remote https://github.com/ipfs/go-ipfs-ds-help v1.1.0
+SRCREV_go-ipfs-ds-help = "0ce85d6dd676a9c7d3018dd79f43b2b1d7f31082"
SRC_URI += "git://github.com/ipfs/go-ipfs-ds-help;name=go-ipfs-ds-help;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipfs-ds-help"

-# github.com/ipfs/go-ipfs-exchange-interface v0.0.1
-# [1] git ls-remote https://github.com/ipfs/go-ipfs-exchange-interface b6e88260772433e18af18bb3f237d78678e65f0b
-SRCREV_go-ipfs-exchange-interface="b6e88260772433e18af18bb3f237d78678e65f0b"
+# github.com/ipfs/go-ipfs-exchange-interface v0.1.0
+# [1] git ls-remote https://github.com/ipfs/go-ipfs-exchange-interface v0.1.0
+SRCREV_go-ipfs-exchange-interface = "2e7c882a034eacabca59c5cd2d9ab959c2da78f7"
SRC_URI += "git://github.com/ipfs/go-ipfs-exchange-interface;name=go-ipfs-exchange-interface;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipfs-exchange-interface"

# github.com/ipfs/go-ipfs-util v0.0.2
@@ -439,9 +438,9 @@ SRC_URI += "git://github.com/ipfs/go-ipfs-util;name=go-ipfs-util;protocol=https;
SRCREV_go-ipld-cbor="f689d2bb3874cf3fafb71721cafb2c945234e781"
SRC_URI += "git://github.com/ipfs/go-ipld-cbor;name=go-ipld-cbor;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipld-cbor"

-# github.com/ipfs/go-ipld-format v0.2.0
-# [1] git ls-remote https://github.com/ipfs/go-ipld-format c582c36b708672f99752a0b6171adec7820e0049
-SRCREV_go-ipld-format="c582c36b708672f99752a0b6171adec7820e0049"
+# github.com/ipfs/go-ipld-format v0.3.0
+# [1] git ls-remote https://github.com/ipfs/go-ipld-format v0.3.0
+SRCREV_go-ipld-format = "c545ab0d87f91c656e48d1adf0ec4dcf4d21f1dc"
SRC_URI += "git://github.com/ipfs/go-ipld-format;name=go-ipld-format;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipld-format"

# github.com/ipfs/go-ipld-legacy v0.1.0
@@ -454,14 +453,14 @@ SRC_URI += "git://github.com/ipfs/go-ipld-legacy;name=go-ipld-legacy;protocol=ht
SRCREV_go-log="0e04229b160a92ebd2a924d9078e087161c8d53f"
SRC_URI += "git://github.com/ipfs/go-log;name=go-log;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-log"

-# github.com/ipfs/go-log/v2 v2.1.3
-# [1] git ls-remote https://github.com/ipfs/go-log 7f9ba9d7836afbe44710289d1c3a7c111f093149
-SRCREV_v212="7f9ba9d7836afbe44710289d1c3a7c111f093149"
-SRC_URI += "git://github.com/ipfs/go-log;name=v212;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-log/v2"
+# github.com/ipfs/go-log/v2 v2.3.0
+# [1] git ls-remote https://github.com/ipfs/go-log v2.3.0
+SRCREV_go-log2 = "2c2975b5095a771b0d8066a458b944ac71591bc7"
+SRC_URI += "git://github.com/ipfs/go-log;name=go-log2;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-log/v2"

-# github.com/ipfs/go-merkledag v0.4.0
-# [1] git ls-remote https://github.com/ipfs/go-merkledag 8794146d52c211b8af0456e734a248649e636be0
-SRCREV_go-merkledag="8794146d52c211b8af0456e734a248649e636be0"
+# github.com/ipfs/go-merkledag v0.6.0
+# [1] git ls-remote https://github.com/ipfs/go-merkledag v0.6.0
+SRCREV_go-merkledag = "c076715ad64cccb1976de3686b0d6304ec3f2839"
SRC_URI += "git://github.com/ipfs/go-merkledag;name=go-merkledag;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-merkledag"

# github.com/ipfs/go-metrics-interface v0.0.1
@@ -499,9 +498,9 @@ SRC_URI += "git://github.com/ipld/go-ipld-prime;name=go-ipld-prime;protocol=http
SRCREV_goprocess="23d20c20149e1f362afda26f4500cb9d6393f0ad"
SRC_URI += "git://github.com/jbenet/goprocess;name=goprocess;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/jbenet/goprocess"

-# github.com/klauspost/compress v1.14.2
-# [1] git ls-remote https://github.com/klauspost/compress 7f260be218b66dc1c5b2d6be2d5c0925aa9a4a0d
-SRCREV_compress="7f260be218b66dc1c5b2d6be2d5c0925aa9a4a0d"
+# github.com/klauspost/compress v1.15.1
+# [1] git ls-remote https://github.com/klauspost/compress v1.15.1
+SRCREV_compress = "7c7079ec1ed2c07fd15e6f3f369dbae5288051d5"
SRC_URI += "git://github.com/klauspost/compress;name=compress;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/klauspost/compress"

# github.com/klauspost/cpuid/v2 v2.0.6
@@ -539,9 +538,9 @@ SRC_URI += "git://github.com/mattn/go-shellwords;name=go-shellwords;protocol=htt
SRCREV_golang_protobuf_extensions="c182affec369e30f25d3eb8cd8a478dee585ae7d"
SRC_URI += "git://github.com/matttproud/golang_protobuf_extensions;name=golang_protobuf_extensions;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/matttproud/golang_protobuf_extensions"

-# github.com/miekg/pkcs11 v1.0.3
-# [1] git ls-remote https://github.com/miekg/pkcs11 210dc1e16747c5ba98a03bcbcf728c38086ea357
-SRCREV_pkcs11="210dc1e16747c5ba98a03bcbcf728c38086ea357"
+# github.com/miekg/pkcs11 v1.1.1
+# [1] git ls-remote https://github.com/miekg/pkcs11 v1.1.1
+SRCREV_pkcs11 = "f3481918a208bd212aa995a41f92d786eb418a7d"
SRC_URI += "git://github.com/miekg/pkcs11;name=pkcs11;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/miekg/pkcs11"

# github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
@@ -634,9 +633,9 @@ SRC_URI += "git://github.com/pkg/errors;name=errors;protocol=https;nobranch=1;de
SRCREV_refmt="30ac6d18308e584ca6a2e74ba81475559db94c5f"
SRC_URI += "git://github.com/polydawn/refmt;name=refmt;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/polydawn/refmt"

-# github.com/prometheus/client_golang v1.12.0
-# [1] git ls-remote https://github.com/prometheus/client_golang 01087964d02726ef7438fdb19c2672e6e5d0b48a
-SRCREV_client_golang="01087964d02726ef7438fdb19c2672e6e5d0b48a"
+# github.com/prometheus/client_golang v1.12.1
+# [1] git ls-remote https://github.com/prometheus/client_golang v1.12.1
+SRCREV_client_golang = "2e1c4818ccfdcf953ce399cadad615ff2bed968c"
SRC_URI += "git://github.com/prometheus/client_golang;name=client_golang;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/client_golang"

# github.com/prometheus/client_model v0.2.0
@@ -754,9 +753,9 @@ SRC_URI += "git://go.googlesource.com/xerrors;name=xerrors;protocol=https;nobran
SRCREV_genproto="9970aeb2e350469c6bdc3e220a3ddecf38a85f61"
SRC_URI += "git://github.com/googleapis/go-genproto;name=genproto;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/google.golang.org/genproto"

-# google.golang.org/grpc v1.44.0
-# [1] git ls-remote https://github.com/grpc/grpc-go b4c5e24c7373b22c6c38d68379c39ecdc616a968
-SRCREV_grpc="b4c5e24c7373b22c6c38d68379c39ecdc616a968"
+# google.golang.org/grpc v1.45.0
+# [1] git ls-remote https://github.com/grpc/grpc-go v1.45.0
+SRCREV_grpc="a82cc96f07c960e02623688e4067ae6b7895334a"
SRC_URI += "git://github.com/grpc/grpc-go;name=grpc;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/google.golang.org/grpc"

# google.golang.org/protobuf v1.27.1
@@ -781,8 +780,6 @@ SRC_URI += "file://0001-Makefile-allow-external-specification-of-build-setti.pat
file://modules.txt \
"

-SRC_URI[sha256sum] = "d7b05a9bff34dfb25abe7e5b1e54cf2607f953d91cb33fb231a4775a1a4afa3d"
-
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

@@ -790,7 +787,7 @@ GO_IMPORT = "import"

# S = "${WORKDIR}/git"

-PV = "v0.17.0"
+PV = "v0.18.0"

NERDCTL_PKG = "github.com/containerd/nerdctl"

@@ -824,7 +821,7 @@ do_compile() {

# this moves all the fetches into the proper vendor structure
# expected for build
- sites="github.com/Microsoft/go-winio:github.com/Microsoft/go-winio github.com/compose-spec/compose-go:github.com/compose-spec/compose-go github.com/containerd/cgroups:github.com/containerd/cgroups github.com/containerd/console:github.com/containerd/console github.com/containerd/containerd:github.com/containerd/containerd github.com/containerd/continuity:github.com/containerd/continuity github.com/containerd/go-cni:github.com/containerd/go-cni github.com/containerd/imgcrypt:github.com/containerd/imgcrypt github.com/containerd/stargz-snapshotter:github.com/containerd/stargz-snapshotter github.com/containerd/stargz-snapshotter/estargz:github.com/containerd/stargz-snapshotter//estargz github.com/containerd/stargz-snapshotter/ipfs:github.com/containerd/stargz-snapshotter//ipfs github.com/containerd/typeurl:github.com/containerd/typeurl github.com/containernetworking/cni:github.com/containernetworking/cni github.com/containernetworking/plugins:github.com/containernetworking/plugins github.com/cyphar/filepath-securejoin:github.com/cyphar/filepath-securejoin github.com/docker/cli:github.com/docker/cli github.com/docker/docker:github.com/docker/docker github.com/docker/go-connections:github.com/docker/go-connections github.com/docker/go-units:github.com/docker/go-units github.com/fatih/color:github.com/fatih/color github.com/gogo/protobuf:github.com/gogo/protobuf github.com/hashicorp/go-multierror:github.com/hashicorp/go-multierror github.com/ipfs/go-cid:github.com/ipfs/go-cid github.com/ipfs/go-ipfs-files:github.com/ipfs/go-ipfs-files github.com/ipfs/go-ipfs-http-client:github.com/ipfs/go-ipfs-http-client github.com/ipfs/interface-go-ipfs-core:github.com/ipfs/interface-go-ipfs-core github.com/jaytaylor/go-hostsfile:github.com/jaytaylor/go-hostsfile github.com/mattn/go-isatty:github.com/mattn/go-isatty github.com/moby/sys/mount:github.com/moby/sys/mount//mount github.com/moby/sys/mountinfo:github.com/moby/sys/mount//mountinfo github.com/moby/sys/signal:github.com/moby/sys/mount//signal github.com/multiformats/go-multiaddr:github.com/multiformats/go-multiaddr github.com/opencontainers/go-digest:github.com/opencontainers/go-digest github.com/opencontainers/image-spec:github.com/opencontainers/image-spec github.com/opencontainers/runtime-spec:github.com/opencontainers/runtime-spec github.com/pelletier/go-toml:github.com/pelletier/go-toml github.com/rootless-containers/bypass4netns:github.com/rootless-containers/bypass4netns github.com/rootless-containers/rootlesskit:github.com/rootless-containers/rootlesskit github.com/sirupsen/logrus:github.com/sirupsen/logrus github.com/spf13/cobra:github.com/spf13/cobra github.com/spf13/pflag:github.com/spf13/pflag github.com/tidwall/gjson:github.com/tidwall/gjson github.com/vishvananda/netlink:github.com/vishvananda/netlink github.com/vishvananda/netns:github.com/vishvananda/netns golang.org/x/crypto:go.googlesource.com/crypto golang.org/x/net:go.googlesource.com/net golang.org/x/sync:go.googlesource.com/sync golang.org/x/sys:go.googlesource.com/sys golang.org/x/term:go.googlesource.com/term gopkg.in/yaml.v2:gopkg.in/yaml.v2 gotest.tools/v3:github.com/gotestyourself/gotest.tools/v3 github.com/Azure/go-ansiterm:github.com/Azure/go-ansiterm github.com/Microsoft/hcsshim:github.com/Microsoft/hcsshim github.com/beorn7/perks:github.com/beorn7/perks github.com/btcsuite/btcd:github.com/btcsuite/btcd github.com/cespare/xxhash/v2:github.com/cespare/xxhash/v2 github.com/cilium/ebpf:github.com/cilium/ebpf github.com/containerd/fifo:github.com/containerd/fifo github.com/containerd/ttrpc:github.com/containerd/ttrpc github.com/containers/ocicrypt:github.com/containers/ocicrypt github.com/coreos/go-systemd/v22:github.com/coreos/go-systemd/v22 github.com/cpuguy83/go-md2man/v2:github.com/cpuguy83/go-md2man/v2 github.com/crackcomm/go-gitignore:github.com/crackcomm/go-gitignore github.com/distribution/distribution/v3:github.com/distribution/distribution/v3 github.com/docker/distribution:github.com/docker/distribution github.com/docker/docker-credential-helpers:github.com/docker/docker-credential-helpers github.com/docker/go-events:github.com/docker/go-events github.com/docker/go-metrics:github.com/docker/go-metrics github.com/godbus/dbus/v5:github.com/godbus/dbus/v5 github.com/gogo/googleapis:github.com/gogo/googleapis github.com/golang/groupcache:github.com/golang/groupcache github.com/golang/protobuf:github.com/golang/protobuf github.com/google/go-cmp:github.com/google/go-cmp github.com/google/uuid:github.com/google/uuid github.com/gorilla/mux:github.com/gorilla/mux github.com/hashicorp/errwrap:github.com/hashicorp/errwrap github.com/hashicorp/golang-lru:github.com/hashicorp/golang-lru github.com/imdario/mergo:github.com/imdario/mergo github.com/inconshreveable/mousetrap:github.com/inconshreveable/mousetrap github.com/ipfs/bbloom:github.com/ipfs/bbloom github.com/ipfs/go-block-format:github.com/ipfs/go-block-format github.com/ipfs/go-blockservice:github.com/ipfs/go-blockservice github.com/ipfs/go-datastore:github.com/ipfs/go-datastore github.com/ipfs/go-ipfs-blockstore:github.com/ipfs/go-ipfs-blockstore github.com/ipfs/go-ipfs-cmds:github.com/ipfs/go-ipfs-cmds github.com/ipfs/go-ipfs-ds-help:github.com/ipfs/go-ipfs-ds-help github.com/ipfs/go-ipfs-exchange-interface:github.com/ipfs/go-ipfs-exchange-interface github.com/ipfs/go-ipfs-util:github.com/ipfs/go-ipfs-util github.com/ipfs/go-ipld-cbor:github.com/ipfs/go-ipld-cbor github.com/ipfs/go-ipld-format:github.com/ipfs/go-ipld-format github.com/ipfs/go-ipld-legacy:github.com/ipfs/go-ipld-legacy github.com/ipfs/go-log:github.com/ipfs/go-log github.com/ipfs/go-log/v2:github.com/ipfs/go-log/v2 github.com/ipfs/go-merkledag:github.com/ipfs/go-merkledag github.com/ipfs/go-metrics-interface:github.com/ipfs/go-metrics-interface github.com/ipfs/go-path:github.com/ipfs/go-path github.com/ipfs/go-unixfs:github.com/ipfs/go-unixfs github.com/ipfs/go-verifcid:github.com/ipfs/go-verifcid github.com/ipld/go-codec-dagpb:github.com/ipld/go-codec-dagpb github.com/ipld/go-ipld-prime:github.com/ipld/go-ipld-prime github.com/jbenet/goprocess:github.com/jbenet/goprocess github.com/klauspost/compress:github.com/klauspost/compress github.com/klauspost/cpuid/v2:github.com/klauspost/cpuid/v2 github.com/libp2p/go-buffer-pool:github.com/libp2p/go-buffer-pool github.com/libp2p/go-libp2p-core:github.com/libp2p/go-libp2p-core github.com/libp2p/go-openssl:github.com/libp2p/go-openssl github.com/mattn/go-colorable:github.com/mattn/go-colorable github.com/mattn/go-shellwords:github.com/mattn/go-shellwords github.com/matttproud/golang_protobuf_extensions:github.com/matttproud/golang_protobuf_extensions github.com/miekg/pkcs11:github.com/miekg/pkcs11 github.com/minio/blake2b-simd:github.com/minio/blake2b-simd github.com/minio/sha256-simd:github.com/minio/sha256-simd github.com/mitchellh/go-homedir:github.com/mitchellh/go-homedir github.com/mitchellh/mapstructure:github.com/mitchellh/mapstructure github.com/moby/locker:github.com/moby/locker github.com/moby/term:github.com/moby/term github.com/morikuni/aec:github.com/morikuni/aec github.com/mr-tron/base58:github.com/mr-tron/base58 github.com/multiformats/go-base32:github.com/multiformats/go-base32 github.com/multiformats/go-base36:github.com/multiformats/go-base36 github.com/multiformats/go-multibase:github.com/multiformats/go-multibase github.com/multiformats/go-multihash:github.com/multiformats/go-multihash github.com/multiformats/go-varint:github.com/multiformats/go-varint github.com/opencontainers/runc:github.com/opencontainers/runc github.com/opencontainers/selinux:github.com/opencontainers/selinux github.com/opentracing/opentracing-go:github.com/opentracing/opentracing-go github.com/pkg/errors:github.com/pkg/errors github.com/polydawn/refmt:github.com/polydawn/refmt github.com/prometheus/client_golang:github.com/prometheus/client_golang github.com/prometheus/client_model:github.com/prometheus/client_model github.com/prometheus/common:github.com/prometheus/common github.com/prometheus/procfs:github.com/prometheus/procfs github.com/rs/cors:github.com/rs/cors github.com/russross/blackfriday/v2:github.com/russross/blackfriday/v2 github.com/spacemonkeygo/spacelog:github.com/spacemonkeygo/spacelog github.com/stefanberger/go-pkcs11uri:github.com/stefanberger/go-pkcs11uri github.com/tidwall/match:github.com/tidwall/match github.com/tidwall/pretty:github.com/tidwall/pretty github.com/urfave/cli:github.com/urfave/cli github.com/vbatts/tar-split:github.com/vbatts/tar-split github.com/whyrusleeping/cbor-gen:github.com/whyrusleeping/cbor-gen github.com/xeipuuv/gojsonpointer:github.com/xeipuuv/gojsonpointer github.com/xeipuuv/gojsonreference:github.com/xeipuuv/gojsonreference github.com/xeipuuv/gojsonschema:github.com/xeipuuv/gojsonschema go.mozilla.org/pkcs7:go.mozilla.org/pkcs7 go.opencensus.io:go.opencensus.io go.uber.org/atomic:go.uber.org/atomic go.uber.org/multierr:go.uber.org/multierr go.uber.org/zap:go.uber.org/zap golang.org/x/text:go.googlesource.com/text golang.org/x/xerrors:go.googlesource.com/xerrors google.golang.org/genproto:google.golang.org/genproto google.golang.org/grpc:google.golang.org/grpc google.golang.org/protobuf:google.golang.org/protobuf gopkg.in/square/go-jose.v2:gopkg.in/square/go-jose.v2 github.com/hashicorp/golang-lru :github.com/hashicorp/golang-lru "
+ sites="github.com/Masterminds/semver/v3:github.com/Masterminds/semver/v3 github.com/Microsoft/go-winio:github.com/Microsoft/go-winio github.com/compose-spec/compose-go:github.com/compose-spec/compose-go github.com/containerd/cgroups:github.com/containerd/cgroups github.com/containerd/console:github.com/containerd/console github.com/containerd/containerd:github.com/containerd/containerd github.com/containerd/continuity:github.com/containerd/continuity github.com/containerd/go-cni:github.com/containerd/go-cni github.com/containerd/imgcrypt:github.com/containerd/imgcrypt github.com/containerd/stargz-snapshotter:github.com/containerd/stargz-snapshotter github.com/containerd/stargz-snapshotter/estargz:github.com/containerd/stargz-snapshotter//estargz github.com/containerd/stargz-snapshotter/ipfs:github.com/containerd/stargz-snapshotter//ipfs github.com/containerd/typeurl:github.com/containerd/typeurl github.com/containernetworking/cni:github.com/containernetworking/cni github.com/containernetworking/plugins:github.com/containernetworking/plugins github.com/cyphar/filepath-securejoin:github.com/cyphar/filepath-securejoin github.com/docker/cli:github.com/docker/cli github.com/docker/docker:github.com/docker/docker github.com/docker/go-connections:github.com/docker/go-connections github.com/docker/go-units:github.com/docker/go-units github.com/fatih/color:github.com/fatih/color github.com/gogo/protobuf:github.com/gogo/protobuf github.com/hashicorp/go-multierror:github.com/hashicorp/go-multierror github.com/ipfs/go-cid:github.com/ipfs/go-cid github.com/ipfs/go-ipfs-files:github.com/ipfs/go-ipfs-files github.com/ipfs/go-ipfs-http-client:github.com/ipfs/go-ipfs-http-client github.com/ipfs/interface-go-ipfs-core:github.com/ipfs/interface-go-ipfs-core github.com/mattn/go-isatty:github.com/mattn/go-isatty github.com/moby/sys/mount:github.com/moby/sys/mount//mount github.com/moby/sys/mountinfo:github.com/moby/sys/mount//mountinfo github.com/moby/sys/signal:github.com/moby/sys/mount//signal github.com/multiformats/go-multiaddr:github.com/multiformats/go-multiaddr github.com/opencontainers/go-digest:github.com/opencontainers/go-digest github.com/opencontainers/image-spec:github.com/opencontainers/image-spec github.com/opencontainers/runtime-spec:github.com/opencontainers/runtime-spec github.com/pelletier/go-toml:github.com/pelletier/go-toml github.com/rootless-containers/bypass4netns:github.com/rootless-containers/bypass4netns github.com/rootless-containers/rootlesskit:github.com/rootless-containers/rootlesskit github.com/sirupsen/logrus:github.com/sirupsen/logrus github.com/spf13/cobra:github.com/spf13/cobra github.com/spf13/pflag:github.com/spf13/pflag github.com/tidwall/gjson:github.com/tidwall/gjson github.com/vishvananda/netlink:github.com/vishvananda/netlink github.com/vishvananda/netns:github.com/vishvananda/netns golang.org/x/crypto:go.googlesource.com/crypto golang.org/x/net:go.googlesource.com/net golang.org/x/sync:go.googlesource.com/sync golang.org/x/sys:go.googlesource.com/sys golang.org/x/term:go.googlesource.com/term gopkg.in/yaml.v2:gopkg.in/yaml.v2 gotest.tools/v3:github.com/gotestyourself/gotest.tools/v3 github.com/Azure/go-ansiterm:github.com/Azure/go-ansiterm github.com/Microsoft/hcsshim:github.com/Microsoft/hcsshim github.com/beorn7/perks:github.com/beorn7/perks github.com/btcsuite/btcd:github.com/btcsuite/btcd github.com/cespare/xxhash/v2:github.com/cespare/xxhash/v2 github.com/cilium/ebpf:github.com/cilium/ebpf github.com/containerd/fifo:github.com/containerd/fifo github.com/containerd/ttrpc:github.com/containerd/ttrpc github.com/containers/ocicrypt:github.com/containers/ocicrypt github.com/coreos/go-systemd/v22:github.com/coreos/go-systemd/v22 github.com/cpuguy83/go-md2man/v2:github.com/cpuguy83/go-md2man/v2 github.com/crackcomm/go-gitignore:github.com/crackcomm/go-gitignore github.com/distribution/distribution/v3:github.com/distribution/distribution/v3 github.com/docker/distribution:github.com/docker/distribution github.com/docker/docker-credential-helpers:github.com/docker/docker-credential-helpers github.com/docker/go-events:github.com/docker/go-events github.com/docker/go-metrics:github.com/docker/go-metrics github.com/godbus/dbus/v5:github.com/godbus/dbus/v5 github.com/gogo/googleapis:github.com/gogo/googleapis github.com/golang/groupcache:github.com/golang/groupcache github.com/golang/protobuf:github.com/golang/protobuf github.com/google/go-cmp:github.com/google/go-cmp github.com/google/uuid:github.com/google/uuid github.com/gorilla/mux:github.com/gorilla/mux github.com/hashicorp/errwrap:github.com/hashicorp/errwrap github.com/hashicorp/golang-lru:github.com/hashicorp/golang-lru github.com/imdario/mergo:github.com/imdario/mergo github.com/inconshreveable/mousetrap:github.com/inconshreveable/mousetrap github.com/ipfs/bbloom:github.com/ipfs/bbloom github.com/ipfs/go-block-format:github.com/ipfs/go-block-format github.com/ipfs/go-blockservice:github.com/ipfs/go-blockservice github.com/ipfs/go-datastore:github.com/ipfs/go-datastore github.com/ipfs/go-ipfs-blockstore:github.com/ipfs/go-ipfs-blockstore github.com/ipfs/go-ipfs-cmds:github.com/ipfs/go-ipfs-cmds github.com/ipfs/go-ipfs-ds-help:github.com/ipfs/go-ipfs-ds-help github.com/ipfs/go-ipfs-exchange-interface:github.com/ipfs/go-ipfs-exchange-interface github.com/ipfs/go-ipfs-util:github.com/ipfs/go-ipfs-util github.com/ipfs/go-ipld-cbor:github.com/ipfs/go-ipld-cbor github.com/ipfs/go-ipld-format:github.com/ipfs/go-ipld-format github.com/ipfs/go-ipld-legacy:github.com/ipfs/go-ipld-legacy github.com/ipfs/go-log:github.com/ipfs/go-log github.com/ipfs/go-log/v2:github.com/ipfs/go-log/v2 github.com/ipfs/go-merkledag:github.com/ipfs/go-merkledag github.com/ipfs/go-metrics-interface:github.com/ipfs/go-metrics-interface github.com/ipfs/go-path:github.com/ipfs/go-path github.com/ipfs/go-unixfs:github.com/ipfs/go-unixfs github.com/ipfs/go-verifcid:github.com/ipfs/go-verifcid github.com/ipld/go-codec-dagpb:github.com/ipld/go-codec-dagpb github.com/ipld/go-ipld-prime:github.com/ipld/go-ipld-prime github.com/jbenet/goprocess:github.com/jbenet/goprocess github.com/klauspost/compress:github.com/klauspost/compress github.com/klauspost/cpuid/v2:github.com/klauspost/cpuid/v2 github.com/libp2p/go-buffer-pool:github.com/libp2p/go-buffer-pool github.com/libp2p/go-libp2p-core:github.com/libp2p/go-libp2p-core github.com/libp2p/go-openssl:github.com/libp2p/go-openssl github.com/mattn/go-colorable:github.com/mattn/go-colorable github.com/mattn/go-shellwords:github.com/mattn/go-shellwords github.com/matttproud/golang_protobuf_extensions:github.com/matttproud/golang_protobuf_extensions github.com/miekg/pkcs11:github.com/miekg/pkcs11 github.com/minio/blake2b-simd:github.com/minio/blake2b-simd github.com/minio/sha256-simd:github.com/minio/sha256-simd github.com/mitchellh/go-homedir:github.com/mitchellh/go-homedir github.com/mitchellh/mapstructure:github.com/mitchellh/mapstructure github.com/moby/locker:github.com/moby/locker github.com/moby/term:github.com/moby/term github.com/morikuni/aec:github.com/morikuni/aec github.com/mr-tron/base58:github.com/mr-tron/base58 github.com/multiformats/go-base32:github.com/multiformats/go-base32 github.com/multiformats/go-base36:github.com/multiformats/go-base36 github.com/multiformats/go-multibase:github.com/multiformats/go-multibase github.com/multiformats/go-multihash:github.com/multiformats/go-multihash github.com/multiformats/go-varint:github.com/multiformats/go-varint github.com/opencontainers/runc:github.com/opencontainers/runc github.com/opencontainers/selinux:github.com/opencontainers/selinux github.com/opentracing/opentracing-go:github.com/opentracing/opentracing-go github.com/pkg/errors:github.com/pkg/errors github.com/polydawn/refmt:github.com/polydawn/refmt github.com/prometheus/client_golang:github.com/prometheus/client_golang github.com/prometheus/client_model:github.com/prometheus/client_model github.com/prometheus/common:github.com/prometheus/common github.com/prometheus/procfs:github.com/prometheus/procfs github.com/rs/cors:github.com/rs/cors github.com/russross/blackfriday/v2:github.com/russross/blackfriday/v2 github.com/spacemonkeygo/spacelog:github.com/spacemonkeygo/spacelog github.com/stefanberger/go-pkcs11uri:github.com/stefanberger/go-pkcs11uri github.com/tidwall/match:github.com/tidwall/match github.com/tidwall/pretty:github.com/tidwall/pretty github.com/urfave/cli:github.com/urfave/cli github.com/vbatts/tar-split:github.com/vbatts/tar-split github.com/whyrusleeping/cbor-gen:github.com/whyrusleeping/cbor-gen github.com/xeipuuv/gojsonpointer:github.com/xeipuuv/gojsonpointer github.com/xeipuuv/gojsonreference:github.com/xeipuuv/gojsonreference github.com/xeipuuv/gojsonschema:github.com/xeipuuv/gojsonschema go.mozilla.org/pkcs7:go.mozilla.org/pkcs7 go.opencensus.io:go.opencensus.io go.uber.org/atomic:go.uber.org/atomic go.uber.org/multierr:go.uber.org/multierr go.uber.org/zap:go.uber.org/zap golang.org/x/text:go.googlesource.com/text golang.org/x/xerrors:go.googlesource.com/xerrors google.golang.org/genproto:google.golang.org/genproto google.golang.org/grpc:google.golang.org/grpc google.golang.org/protobuf:google.golang.org/protobuf gopkg.in/square/go-jose.v2:gopkg.in/square/go-jose.v2 github.com/hashicorp/golang-lru :github.com/hashicorp/golang-lru "
for s in $sites; do
site_dest=$(echo $s | cut -d: -f1)
site_source=$(echo $s | cut -d: -f2)
--
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] nerdctl: upgrade to v0.18.0

Bruce Ashfield
 

As I mentioned earlier, I have a WIP progress version bump that I'm
testing the script/tool against.

I'll keep this as a reference, and will follow up with the delta
between what I end up with, and this.

Bruce

On Mon, Apr 18, 2022 at 6:46 AM Chen Qi <Qi.Chen@...> wrote:

Signed-off-by: Chen Qi <Qi.Chen@...>
---
.../nerdctl/nerdctl/modules.txt | 72 +++---
recipes-containers/nerdctl/nerdctl_git.bb | 205 +++++++++---------
2 files changed, 137 insertions(+), 140 deletions(-)

diff --git a/recipes-containers/nerdctl/nerdctl/modules.txt b/recipes-containers/nerdctl/nerdctl/modules.txt
index 3b144736..5f90f206 100644
--- a/recipes-containers/nerdctl/nerdctl/modules.txt
+++ b/recipes-containers/nerdctl/nerdctl/modules.txt
@@ -1,36 +1,38 @@
+# github.com/Masterminds/semver/v3 v3.1.1
+## explicit
# github.com/Microsoft/go-winio v0.5.2
## explicit
-# github.com/compose-spec/compose-go v1.0.9
+# github.com/compose-spec/compose-go v1.1.0
## explicit
# github.com/containerd/cgroups v1.0.3
## explicit
# github.com/containerd/console v1.0.3
## explicit
-# github.com/containerd/containerd v1.6.0
+# github.com/containerd/containerd v1.6.2
## explicit
# github.com/containerd/continuity v0.2.2
## explicit
-# github.com/containerd/go-cni v1.1.3
+# github.com/containerd/go-cni v1.1.4
## explicit
-# github.com/containerd/imgcrypt v1.1.3
+# github.com/containerd/imgcrypt v1.1.4
## explicit
-# github.com/containerd/stargz-snapshotter v0.11.0
+# github.com/containerd/stargz-snapshotter v0.11.3
## explicit
-# github.com/containerd/stargz-snapshotter/estargz v0.11.0
+# github.com/containerd/stargz-snapshotter/estargz v0.11.3
## explicit
-# github.com/containerd/stargz-snapshotter/ipfs v0.11.0
+# github.com/containerd/stargz-snapshotter/ipfs v0.11.3
## explicit
# github.com/containerd/typeurl v1.0.2
## explicit
# github.com/containernetworking/cni v1.0.1
## explicit
-# github.com/containernetworking/plugins v1.0.1
+# github.com/containernetworking/plugins v1.1.1
## explicit
# github.com/cyphar/filepath-securejoin v0.2.3
## explicit
-# github.com/docker/cli v20.10.12+incompatible
+# github.com/docker/cli v20.10.14+incompatible
## explicit
-# github.com/docker/docker v20.10.12+incompatible
+# github.com/docker/docker v20.10.14+incompatible
## explicit
# github.com/docker/go-connections v0.4.0
## explicit
@@ -48,9 +50,7 @@
## explicit
# github.com/ipfs/go-ipfs-http-client v0.2.0
## explicit
-# github.com/ipfs/interface-go-ipfs-core v0.5.2
-## explicit
-# github.com/jaytaylor/go-hostsfile v0.0.0-20211120191712-f53f85d8b98f
+# github.com/ipfs/interface-go-ipfs-core v0.6.1
## explicit
# github.com/mattn/go-isatty v0.0.14
## explicit
@@ -60,35 +60,35 @@
## explicit
# github.com/opencontainers/go-digest v1.0.0
## explicit
-# github.com/opencontainers/image-spec v1.0.3-0.20211215212317-ea0209f50ae1
+# github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1
## explicit
-# github.com/opencontainers/runtime-spec v1.0.3-0.20211214071223-8958f93039ab
+# github.com/opencontainers/runtime-spec v1.0.3-0.20220311020903-6969a0a09ab1
## explicit
# github.com/pelletier/go-toml v1.9.4
## explicit
-# github.com/rootless-containers/bypass4netns v0.1.1-0.20220214050838-562b4845f47e
+# github.com/rootless-containers/bypass4netns v0.2.2
## explicit
-# github.com/rootless-containers/rootlesskit v0.14.6
+# github.com/rootless-containers/rootlesskit v1.0.0
## explicit
# github.com/sirupsen/logrus v1.8.1
## explicit
-# github.com/spf13/cobra v1.3.0
+# github.com/spf13/cobra v1.4.0
## explicit
# github.com/spf13/pflag v1.0.5
## explicit
# github.com/tidwall/gjson v1.14.0
## explicit
-# github.com/vishvananda/netlink v1.1.1-0.20220125195016-0639e7e787ba
+# github.com/vishvananda/netlink v1.1.1-0.20220318152240-083e92e21eeb
## explicit
# github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74
## explicit
-# golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
+# golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064
## explicit
-# golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
+# golang.org/x/net v0.0.0-20220225172249-27dd8689420f
## explicit
# golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
## explicit
-# golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27
+# golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8
## explicit
# golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
## explicit
@@ -112,7 +112,7 @@
## explicit
# github.com/containerd/ttrpc v1.1.0
## explicit
-# github.com/containers/ocicrypt v1.1.2
+# github.com/containers/ocicrypt v1.1.3
## explicit
# github.com/coreos/go-systemd/v22 v22.3.2
## explicit
@@ -156,31 +156,31 @@
## explicit
# github.com/ipfs/go-block-format v0.0.3
## explicit
-# github.com/ipfs/go-blockservice v0.1.7
+# github.com/ipfs/go-blockservice v0.3.0
## explicit
-# github.com/ipfs/go-datastore v0.4.5
+# github.com/ipfs/go-datastore v0.5.0
## explicit
-# github.com/ipfs/go-ipfs-blockstore v0.1.6
+# github.com/ipfs/go-ipfs-blockstore v1.2.0
## explicit
# github.com/ipfs/go-ipfs-cmds v0.6.0
## explicit
-# github.com/ipfs/go-ipfs-ds-help v0.1.1
+# github.com/ipfs/go-ipfs-ds-help v1.1.0
## explicit
-# github.com/ipfs/go-ipfs-exchange-interface v0.0.1
+# github.com/ipfs/go-ipfs-exchange-interface v0.1.0
## explicit
# github.com/ipfs/go-ipfs-util v0.0.2
## explicit
# github.com/ipfs/go-ipld-cbor v0.0.5
## explicit
-# github.com/ipfs/go-ipld-format v0.2.0
+# github.com/ipfs/go-ipld-format v0.3.0
## explicit
# github.com/ipfs/go-ipld-legacy v0.1.0
## explicit
# github.com/ipfs/go-log v1.0.5
## explicit
-# github.com/ipfs/go-log/v2 v2.1.3
+# github.com/ipfs/go-log/v2 v2.3.0
## explicit
-# github.com/ipfs/go-merkledag v0.4.0
+# github.com/ipfs/go-merkledag v0.6.0
## explicit
# github.com/ipfs/go-metrics-interface v0.0.1
## explicit
@@ -196,7 +196,7 @@
## explicit
# github.com/jbenet/goprocess v0.1.4
## explicit
-# github.com/klauspost/compress v1.14.2
+# github.com/klauspost/compress v1.15.1
## explicit
# github.com/klauspost/cpuid/v2 v2.0.6
## explicit
@@ -212,7 +212,7 @@
## explicit
# github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369
## explicit
-# github.com/miekg/pkcs11 v1.0.3
+# github.com/miekg/pkcs11 v1.1.1
## explicit
# github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
## explicit
@@ -254,7 +254,7 @@
## explicit
# github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e
## explicit
-# github.com/prometheus/client_golang v1.12.0
+# github.com/prometheus/client_golang v1.12.1
## explicit
# github.com/prometheus/client_model v0.2.0
## explicit
@@ -302,7 +302,7 @@
## explicit
# google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350
## explicit
-# google.golang.org/grpc v1.44.0
+# google.golang.org/grpc v1.45.0
## explicit
# google.golang.org/protobuf v1.27.1
## explicit
@@ -310,4 +310,4 @@
## explicit
# github.com/ktock/golang-lru v0.5.5-0.20211029085301-ec551be6f75c
## explicit
-# github.com/hashicorp/golang-lru => github.com/ktock/golang-lru v0.5.5-0.20211029085301-ec551be6f75c
+# github.com/hashicorp/golang-lru => github.com/ktock/golang-lru v0.5.5-0.20211029085301-ec551be6f75c
diff --git a/recipes-containers/nerdctl/nerdctl_git.bb b/recipes-containers/nerdctl/nerdctl_git.bb
index e0e87de4..c402c578 100644
--- a/recipes-containers/nerdctl/nerdctl_git.bb
+++ b/recipes-containers/nerdctl/nerdctl_git.bb
@@ -9,19 +9,23 @@ DEPENDS = " \
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
"

-#SRCREV_FORMAT="nerdcli_cgroups"
-SRCREV_nerdcli = "f2427ffbd1dd67231722fb307f39eecf702de980"
+SRCREV_nerdcli = "77276ff0fffad3f855ab9f2f5a4ad5527ef76485"

SRC_URI = "git://github.com/containerd/nerdctl.git;name=nerdcli;branch=master;protocol=https"

+# github.com/Masterminds/semver/v3 v3.1.1
+# [1] git ls-remote https://github.com/Masterminds/semver/v3 v3.1.1
+SRCREV_semver="d387ce7889a157b19ad7694dba39a562051f41b0"
+SRC_URI += "git://github.com/Masterminds/semver;name=semver;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/Masterminds/semver/v3"
+
# github.com/Microsoft/go-winio v0.5.2
# [1] git ls-remote https://github.com/Microsoft/go-winio dfd7da8f92a382999d77b5d9cfe8cc6bec1894c6
SRCREV_go-winio="dfd7da8f92a382999d77b5d9cfe8cc6bec1894c6"
SRC_URI += "git://github.com/Microsoft/go-winio;name=go-winio;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/Microsoft/go-winio"

-# github.com/compose-spec/compose-go v1.0.9
-# [1] git ls-remote https://github.com/compose-spec/compose-go ad7931673da9b06dd2a326d91a2ab015d62a31d8
-SRCREV_compose-go="ad7931673da9b06dd2a326d91a2ab015d62a31d8"
+# github.com/compose-spec/compose-go v1.1.0
+# [1] git ls-remote https://github.com/compose-spec/compose-go 8c0547c394378beefe7100ffd419b476fb99eb60
+SRCREV_compose-go="8c0547c394378beefe7100ffd419b476fb99eb60"
SRC_URI += "git://github.com/compose-spec/compose-go;name=compose-go;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/compose-spec/compose-go"

# github.com/containerd/cgroups v1.0.3
@@ -34,9 +38,9 @@ SRC_URI += "git://github.com/containerd/cgroups;name=cgroups;protocol=https;nobr
SRCREV_console="060a791de16aeb90b3bb4dcd78dfec3ca45fa5df"
SRC_URI += "git://github.com/containerd/console;name=console;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/console"

-# github.com/containerd/containerd v1.6.0
-# [1] git ls-remote https://github.com/containerd/containerd 13a9d2087b04c1a99ba3fb3159fbd6b2493ca6dd
-SRCREV_containerd="13a9d2087b04c1a99ba3fb3159fbd6b2493ca6dd"
+# github.com/containerd/containerd v1.6.2
+# [1] git ls-remote https://github.com/containerd/containerd v1.6.2
+SRCREV_containerd = "b30221197bbf818a48ec3f20f5e72a739f84ebeb"
SRC_URI += "git://github.com/containerd/containerd;name=containerd;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/containerd"

# github.com/containerd/continuity v0.2.2
@@ -44,19 +48,19 @@ SRC_URI += "git://github.com/containerd/containerd;name=containerd;protocol=http
SRCREV_continuity="3a5e5b882aed17b35e1cea5bbc0a4c26b40ab268"
SRC_URI += "git://github.com/containerd/continuity;name=continuity;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/continuity"

-# github.com/containerd/go-cni v1.1.3
-# [1] git ls-remote https://github.com/containerd/go-cni d3dcbd535b9e305167e3d27e1b8cd7bbd4c3c382
-SRCREV_go-cni="d3dcbd535b9e305167e3d27e1b8cd7bbd4c3c382"
+# github.com/containerd/go-cni v1.1.4
+# [1] git ls-remote https://github.com/containerd/go-cni v1.1.4
+SRCREV_go-cni = "1ae42404d2502e705c1c61de9c254a7cd7f6e74b"
SRC_URI += "git://github.com/containerd/go-cni;name=go-cni;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/go-cni"

-# github.com/containerd/imgcrypt v1.1.3
-# [1] git ls-remote https://github.com/containerd/imgcrypt 41198ab93e7616c40a1ed505256a664b81fe84c1
-SRCREV_imgcrypt="41198ab93e7616c40a1ed505256a664b81fe84c1"
+# github.com/containerd/imgcrypt v1.1.4
+# [1] git ls-remote https://github.com/containerd/imgcrypt v1.1.4
+SRCREV_imgcrypt = "7931b2f099de27afc80e84df85f9361ee6668dd1"
SRC_URI += "git://github.com/containerd/imgcrypt;name=imgcrypt;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/imgcrypt"

-# github.com/containerd/stargz-snapshotter v0.11.0
-# [1] git ls-remote https://github.com/containerd/stargz-snapshotter 7216b07a2f8f0ec3ec1fb8c6ac8a933c70b82eec
-SRCREV_stargz-snapshotter="7216b07a2f8f0ec3ec1fb8c6ac8a933c70b82eec"
+# github.com/containerd/stargz-snapshotter v0.11.3
+# [1] git ls-remote https://github.com/containerd/stargz-snapshotter v0.11.3
+SRCREV_stargz-snapshotter = "84c8e540467f8701fbf1ba7fb9fce749fdbaf160"
SRC_URI += "git://github.com/containerd/stargz-snapshotter;name=stargz-snapshotter;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/stargz-snapshotter"

# github.com/containerd/typeurl v1.0.2
@@ -69,9 +73,9 @@ SRC_URI += "git://github.com/containerd/typeurl;name=typeurl;protocol=https;nobr
SRCREV_cni="1694fd7b57e0176a98a12823a5ffc03337fdc152"
SRC_URI += "git://github.com/containernetworking/cni;name=cni;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containernetworking/cni"

-# github.com/containernetworking/plugins v1.0.1
-# [1] git ls-remote https://github.com/containernetworking/plugins 56d8364f1bd3fa0d35717936ec5cd385e61d3815
-SRCREV_plugins="56d8364f1bd3fa0d35717936ec5cd385e61d3815"
+# github.com/containernetworking/plugins v1.1.1
+# [1] git ls-remote https://github.com/containernetworking/plugins v1.1.1
+SRCREV_plugins = "587d42b2ca2b8fb2f111b50fd90f0089cc03b8ad"
SRC_URI += "git://github.com/containernetworking/plugins;name=plugins;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containernetworking/plugins"

# github.com/cyphar/filepath-securejoin v0.2.3
@@ -79,14 +83,14 @@ SRC_URI += "git://github.com/containernetworking/plugins;name=plugins;protocol=h
SRCREV_filepath-securejoin="a89baba1e4f44c5512e245cbd156de1293d6185a"
SRC_URI += "git://github.com/cyphar/filepath-securejoin;name=filepath-securejoin;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/cyphar/filepath-securejoin"

-# github.com/docker/cli v20.10.12+incompatible
-# [1] git ls-remote https://github.com/docker/cli 60293e390eba4de1a06309b75bbf61dd7a45bbcb
-SRCREV_cli="60293e390eba4de1a06309b75bbf61dd7a45bbcb"
+# github.com/docker/cli v20.10.14+incompatible
+# [1] git ls-remote https://github.com/docker/cli v20.10.14
+SRCREV_cli="0a7772e9b73210a9c25df0d1d74a6566b5e410eb"
SRC_URI += "git://github.com/docker/cli;name=cli;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/docker/cli"

# github.com/docker/docker v20.10.12+incompatible
-# [1] git ls-remote https://github.com/docker/docker bd6d47cb470e2c31acaef7dc0da42dc8cfb42085
-SRCREV_docker="bd6d47cb470e2c31acaef7dc0da42dc8cfb42085"
+# [1] git ls-remote https://github.com/docker/docker v20.10.14
+SRCREV_docker="0ea83a3744846f1b998016406c457c3d6c68c7a6"
SRC_URI += "git://github.com/docker/docker;name=docker;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/docker/docker"

# github.com/docker/go-connections v0.4.0
@@ -129,16 +133,11 @@ SRC_URI += "git://github.com/ipfs/go-ipfs-files;name=go-ipfs-files;protocol=http
SRCREV_go-ipfs-http-client="434ac969c653f7c4781144aaa2834b5f8828ce22"
SRC_URI += "git://github.com/ipfs/go-ipfs-http-client;name=go-ipfs-http-client;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipfs-http-client"

-# github.com/ipfs/interface-go-ipfs-core v0.5.2
-# [1] git ls-remote https://github.com/ipfs/interface-go-ipfs-core 275b80e1f34ead0fb06a9216e3bffee57a01b636
-SRCREV_interface-go-ipfs-core="275b80e1f34ead0fb06a9216e3bffee57a01b636"
+# github.com/ipfs/interface-go-ipfs-core v0.6.1
+# [1] git ls-remote https://github.com/ipfs/interface-go-ipfs-core v0.6.1
+SRCREV_interface-go-ipfs-core = "d61758a39392e9853a304189a26c3e546e00ee3a"
SRC_URI += "git://github.com/ipfs/interface-go-ipfs-core;name=interface-go-ipfs-core;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/interface-go-ipfs-core"

-# github.com/jaytaylor/go-hostsfile v0.0.0-20211120191712-f53f85d8b98f
-# [1] git ls-remote https://github.com/jaytaylor/go-hostsfile f53f85d8b98f8f4925bceab7890a431e2f46c38f
-SRCREV_go-hostsfile="f53f85d8b98f8f4925bceab7890a431e2f46c38f"
-SRC_URI += "git://github.com/jaytaylor/go-hostsfile;name=go-hostsfile;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/jaytaylor/go-hostsfile"
-
# github.com/mattn/go-isatty v0.0.14
# [1] git ls-remote https://github.com/mattn/go-isatty 504425e14f742f1f517c4586048b49b37f829c8e
SRCREV_go-isatty="504425e14f742f1f517c4586048b49b37f829c8e"
@@ -159,14 +158,14 @@ SRC_URI += "git://github.com/multiformats/go-multiaddr;name=go-multiaddr;protoco
SRCREV_go-digest="4a41a1fddd8208cc64f911e551a7f361716f8ae5"
SRC_URI += "git://github.com/opencontainers/go-digest;name=go-digest;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/opencontainers/go-digest"

-# github.com/opencontainers/image-spec v1.0.3-0.20211215212317-ea0209f50ae1
-# [1] git ls-remote https://github.com/opencontainers/image-spec ea0209f50ae1a3707cff054cdb6b7487050487de
-SRCREV_image-spec="ea0209f50ae1a3707cff054cdb6b7487050487de"
+# github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1
+# [1] git ls-remote https://github.com/opencontainers/image-spec 02efb9a75ee11e05937b535cc5f228f9343ab2f5
+SRCREV_image-spec="02efb9a75ee11e05937b535cc5f228f9343ab2f5"
SRC_URI += "git://github.com/opencontainers/image-spec;name=image-spec;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/opencontainers/image-spec"

-# github.com/opencontainers/runtime-spec v1.0.3-0.20211214071223-8958f93039ab
-# [1] git ls-remote https://github.com/opencontainers/runtime-spec 8958f93039ab90be53d803cd7e231a775f644451
-SRCREV_runtime-spec="8958f93039ab90be53d803cd7e231a775f644451"
+# github.com/opencontainers/runtime-spec v1.0.3-0.20220311020903-6969a0a09ab1
+# [1] git ls-remote https://github.com/opencontainers/runtime-spec 6969a0a09ab162a574cafcc9ac814e498962c943
+SRCREV_runtime-spec="6969a0a09ab162a574cafcc9ac814e498962c943"
SRC_URI += "git://github.com/opencontainers/runtime-spec;name=runtime-spec;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/opencontainers/runtime-spec"

# github.com/pelletier/go-toml v1.9.4
@@ -174,14 +173,14 @@ SRC_URI += "git://github.com/opencontainers/runtime-spec;name=runtime-spec;proto
SRCREV_go-toml="b8ba995eaaba4be30c8a8090bdfb4aa61af52054"
SRC_URI += "git://github.com/pelletier/go-toml;name=go-toml;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/pelletier/go-toml"

-# github.com/rootless-containers/bypass4netns v0.1.1-0.20220214050838-562b4845f47e
-# [1] git ls-remote https://github.com/rootless-containers/bypass4netns 562b4845f47e3bb1019e37369948845a27ef5b58
-SRCREV_bypass4netns="562b4845f47e3bb1019e37369948845a27ef5b58"
+# github.com/rootless-containers/bypass4netns v0.2.2
+# [1] git ls-remote https://github.com/rootless-containers/bypass4netns c3682687bc69a704c4ca312ab61febe2606c9680
+SRCREV_bypass4netns="c3682687bc69a704c4ca312ab61febe2606c9680"
SRC_URI += "git://github.com/rootless-containers/bypass4netns;name=bypass4netns;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rootless-containers/bypass4netns"

-# github.com/rootless-containers/rootlesskit v0.14.6
-# [1] git ls-remote https://github.com/rootless-containers/rootlesskit 0f88c14fd0966e018bb8f0eefc57c5283459a56c
-SRCREV_rootlesskit="0f88c14fd0966e018bb8f0eefc57c5283459a56c"
+# github.com/rootless-containers/rootlesskit v1.0.0
+# [1] git ls-remote https://github.com/rootless-containers/rootlesskit v1.0.0
+SRCREV_rootlesskit = "4c5afdcdb381581c7eaaea09ac9cdf226b8dda03"
SRC_URI += "git://github.com/rootless-containers/rootlesskit;name=rootlesskit;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rootless-containers/rootlesskit"

# github.com/sirupsen/logrus v1.8.1
@@ -189,9 +188,9 @@ SRC_URI += "git://github.com/rootless-containers/rootlesskit;name=rootlesskit;pr
SRCREV_logrus="bdc0db8ead3853c56b7cd1ac2ba4e11b47d7da6b"
SRC_URI += "git://github.com/sirupsen/logrus;name=logrus;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/sirupsen/logrus"

-# github.com/spf13/cobra v1.3.0
-# [1] git ls-remote https://github.com/spf13/cobra 178edbb247f35e466578211dcf5f4892dbbd369b
-SRCREV_cobra="178edbb247f35e466578211dcf5f4892dbbd369b"
+# github.com/spf13/cobra v1.4.0
+# [1] git ls-remote https://github.com/spf13/cobra v1.4.0
+SRCREV_cobra = "5b2b9e9f61d36ccb66167301f76a2292c3729855"
SRC_URI += "git://github.com/spf13/cobra;name=cobra;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/spf13/cobra"

# github.com/spf13/pflag v1.0.5
@@ -204,9 +203,9 @@ SRC_URI += "git://github.com/spf13/pflag;name=pflag;protocol=https;nobranch=1;de
SRCREV_gjson="7a94820afd8a0d993c07b9cde761b95943823a9f"
SRC_URI += "git://github.com/tidwall/gjson;name=gjson;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tidwall/gjson"

-# github.com/vishvananda/netlink v1.1.1-0.20220125195016-0639e7e787ba
-# [1] git ls-remote https://github.com/vishvananda/netlink 0639e7e787ba7257fc7d097a14d203b1cf1fece9
-SRCREV_netlink="0639e7e787ba7257fc7d097a14d203b1cf1fece9"
+# github.com/vishvananda/netlink v1.1.1-0.20220318152240-083e92e21eeb
+# [1] git ls-remote https://github.com/vishvananda/netlink 083e92e21eebde7a218b0da26a7a1b27c9b5e0f0
+SRCREV_netlink="083e92e21eebde7a218b0da26a7a1b27c9b5e0f0"
SRC_URI += "git://github.com/vishvananda/netlink;name=netlink;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/vishvananda/netlink"

# github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74
@@ -214,14 +213,14 @@ SRC_URI += "git://github.com/vishvananda/netlink;name=netlink;protocol=https;nob
SRCREV_netns="50045581ed74c15eded78746bae9fb3df07d6655"
SRC_URI += "git://github.com/vishvananda/netns;name=netns;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/vishvananda/netns"

-# golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
-# [1] git ls-remote https://go.googlesource.com/crypto e495a2d5b3d3be43468d0ebb413f46eeaedf7eb3
-SRCREV_crypto="e495a2d5b3d3be43468d0ebb413f46eeaedf7eb3"
+# golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064
+# [1] git ls-remote https://go.googlesource.com/crypto 2c7772ba30643b7a2026cbea938420dce7c6384d
+SRCREV_crypto="2c7772ba30643b7a2026cbea938420dce7c6384d"
SRC_URI += "git://go.googlesource.com/crypto;name=crypto;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/crypto"

-# golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
-# [1] git ls-remote https://go.googlesource.com/net cd36cc0744dd695657988f15f08446dc81e16efc
-SRCREV_net="cd36cc0744dd695657988f15f08446dc81e16efc"
+# golang.org/x/net v0.0.0-20220225172249-27dd8689420f
+# [1] git ls-remote https://go.googlesource.com/net 27dd8689420fcde088514397d015e4fea5174e0e
+SRCREV_net="27dd8689420fcde088514397d015e4fea5174e0e"
SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/net"

# golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
@@ -229,9 +228,9 @@ SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;des
SRCREV_sync="036812b2e83c0ddf193dd5a34e034151da389d09"
SRC_URI += "git://go.googlesource.com/sync;name=sync;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/sync"

-# golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27
-# [1] git ls-remote https://go.googlesource.com/sys 99c3d69c2c27d4f16bc6cb2698ad877a3ba5fe75
-SRCREV_sys="99c3d69c2c27d4f16bc6cb2698ad877a3ba5fe75"
+# golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8
+# [1] git ls-remote https://go.googlesource.com/sys a9b59b0215f867c0675d50602208ab8c4f4fe9c7
+SRCREV_sys="a9b59b0215f867c0675d50602208ab8c4f4fe9c7"
SRC_URI += "git://go.googlesource.com/sys;name=sys;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/sys"

# golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
@@ -289,9 +288,9 @@ SRC_URI += "git://github.com/containerd/fifo;name=fifo;protocol=https;nobranch=1
SRCREV_ttrpc="5e8fe05f04c91bc8713ee4241e58d0b9da1c4a59"
SRC_URI += "git://github.com/containerd/ttrpc;name=ttrpc;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/ttrpc"

-# github.com/containers/ocicrypt v1.1.2
-# [1] git ls-remote https://github.com/containers/ocicrypt 1272152ccae67a2c3a4ed543d72b7e42928c99bb
-SRCREV_ocicrypt="1272152ccae67a2c3a4ed543d72b7e42928c99bb"
+# github.com/containers/ocicrypt v1.1.3
+# [1] git ls-remote https://github.com/containers/ocicrypt v1.1.3
+SRCREV_ocicrypt = "01e7d427cd74fec566a69393e3de805df382f77c"
SRC_URI += "git://github.com/containers/ocicrypt;name=ocicrypt;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containers/ocicrypt"

# github.com/coreos/go-systemd/v22 v22.3.2
@@ -399,19 +398,19 @@ SRC_URI += "git://github.com/ipfs/bbloom;name=bbloom;protocol=https;nobranch=1;d
SRCREV_go-block-format="b30b45004baf0d2dcd3d1b5b5604fb4c0ccb0825"
SRC_URI += "git://github.com/ipfs/go-block-format;name=go-block-format;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-block-format"

-# github.com/ipfs/go-blockservice v0.1.7
-# [1] git ls-remote https://github.com/ipfs/go-blockservice 7e86180be5c2959033db973c0eae033de03dd423
-SRCREV_go-blockservice="7e86180be5c2959033db973c0eae033de03dd423"
+# github.com/ipfs/go-blockservice v0.3.0
+# [1] git ls-remote https://github.com/ipfs/go-blockservice v0.3.0
+SRCREV_go-blockservice = "888c7cc7c29cf4752865ce2e856237cb1d5c85b2"
SRC_URI += "git://github.com/ipfs/go-blockservice;name=go-blockservice;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-blockservice"

-# github.com/ipfs/go-datastore v0.4.5
-# [1] git ls-remote https://github.com/ipfs/go-datastore 73ce3192124c5781bc875f2e5d4f483ab8de0d04
-SRCREV_go-datastore="73ce3192124c5781bc875f2e5d4f483ab8de0d04"
+# github.com/ipfs/go-datastore v0.5.0
+# [1] git ls-remote https://github.com/ipfs/go-datastore v0.5.0
+SRCREV_go-datastore = "7548998537794105418980aeb5dac19802712392"
SRC_URI += "git://github.com/ipfs/go-datastore;name=go-datastore;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-datastore"

-# github.com/ipfs/go-ipfs-blockstore v0.1.6
-# [1] git ls-remote https://github.com/ipfs/go-ipfs-blockstore 95a1a08b33f8e55a45a4c306f6f05cf91e8f0728
-SRCREV_go-ipfs-blockstore="95a1a08b33f8e55a45a4c306f6f05cf91e8f0728"
+# github.com/ipfs/go-ipfs-blockstore v1.2.0
+# [1] git ls-remote https://github.com/ipfs/go-ipfs-blockstore v1.2.0
+SRCREV_go-ipfs-blockstore = "ffd43a8d91e6ee80b26d3a6eca5b8c4816c5508b"
SRC_URI += "git://github.com/ipfs/go-ipfs-blockstore;name=go-ipfs-blockstore;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipfs-blockstore"

# github.com/ipfs/go-ipfs-cmds v0.6.0
@@ -419,14 +418,14 @@ SRC_URI += "git://github.com/ipfs/go-ipfs-blockstore;name=go-ipfs-blockstore;pro
SRCREV_go-ipfs-cmds="4ade007405e5d3befb14184290576c63cc43a6a3"
SRC_URI += "git://github.com/ipfs/go-ipfs-cmds;name=go-ipfs-cmds;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipfs-cmds"

-# github.com/ipfs/go-ipfs-ds-help v0.1.1
-# [1] git ls-remote https://github.com/ipfs/go-ipfs-ds-help 48b9cc210923d23b39582b5fa6670ed0d08dc2af
-SRCREV_go-ipfs-ds-help="48b9cc210923d23b39582b5fa6670ed0d08dc2af"
+# github.com/ipfs/go-ipfs-ds-help v1.1.0
+# [1] git ls-remote https://github.com/ipfs/go-ipfs-ds-help v1.1.0
+SRCREV_go-ipfs-ds-help = "0ce85d6dd676a9c7d3018dd79f43b2b1d7f31082"
SRC_URI += "git://github.com/ipfs/go-ipfs-ds-help;name=go-ipfs-ds-help;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipfs-ds-help"

-# github.com/ipfs/go-ipfs-exchange-interface v0.0.1
-# [1] git ls-remote https://github.com/ipfs/go-ipfs-exchange-interface b6e88260772433e18af18bb3f237d78678e65f0b
-SRCREV_go-ipfs-exchange-interface="b6e88260772433e18af18bb3f237d78678e65f0b"
+# github.com/ipfs/go-ipfs-exchange-interface v0.1.0
+# [1] git ls-remote https://github.com/ipfs/go-ipfs-exchange-interface v0.1.0
+SRCREV_go-ipfs-exchange-interface = "2e7c882a034eacabca59c5cd2d9ab959c2da78f7"
SRC_URI += "git://github.com/ipfs/go-ipfs-exchange-interface;name=go-ipfs-exchange-interface;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipfs-exchange-interface"

# github.com/ipfs/go-ipfs-util v0.0.2
@@ -439,9 +438,9 @@ SRC_URI += "git://github.com/ipfs/go-ipfs-util;name=go-ipfs-util;protocol=https;
SRCREV_go-ipld-cbor="f689d2bb3874cf3fafb71721cafb2c945234e781"
SRC_URI += "git://github.com/ipfs/go-ipld-cbor;name=go-ipld-cbor;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipld-cbor"

-# github.com/ipfs/go-ipld-format v0.2.0
-# [1] git ls-remote https://github.com/ipfs/go-ipld-format c582c36b708672f99752a0b6171adec7820e0049
-SRCREV_go-ipld-format="c582c36b708672f99752a0b6171adec7820e0049"
+# github.com/ipfs/go-ipld-format v0.3.0
+# [1] git ls-remote https://github.com/ipfs/go-ipld-format v0.3.0
+SRCREV_go-ipld-format = "c545ab0d87f91c656e48d1adf0ec4dcf4d21f1dc"
SRC_URI += "git://github.com/ipfs/go-ipld-format;name=go-ipld-format;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-ipld-format"

# github.com/ipfs/go-ipld-legacy v0.1.0
@@ -454,14 +453,14 @@ SRC_URI += "git://github.com/ipfs/go-ipld-legacy;name=go-ipld-legacy;protocol=ht
SRCREV_go-log="0e04229b160a92ebd2a924d9078e087161c8d53f"
SRC_URI += "git://github.com/ipfs/go-log;name=go-log;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-log"

-# github.com/ipfs/go-log/v2 v2.1.3
-# [1] git ls-remote https://github.com/ipfs/go-log 7f9ba9d7836afbe44710289d1c3a7c111f093149
-SRCREV_v212="7f9ba9d7836afbe44710289d1c3a7c111f093149"
-SRC_URI += "git://github.com/ipfs/go-log;name=v212;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-log/v2"
+# github.com/ipfs/go-log/v2 v2.3.0
+# [1] git ls-remote https://github.com/ipfs/go-log v2.3.0
+SRCREV_go-log2 = "2c2975b5095a771b0d8066a458b944ac71591bc7"
+SRC_URI += "git://github.com/ipfs/go-log;name=go-log2;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-log/v2"

-# github.com/ipfs/go-merkledag v0.4.0
-# [1] git ls-remote https://github.com/ipfs/go-merkledag 8794146d52c211b8af0456e734a248649e636be0
-SRCREV_go-merkledag="8794146d52c211b8af0456e734a248649e636be0"
+# github.com/ipfs/go-merkledag v0.6.0
+# [1] git ls-remote https://github.com/ipfs/go-merkledag v0.6.0
+SRCREV_go-merkledag = "c076715ad64cccb1976de3686b0d6304ec3f2839"
SRC_URI += "git://github.com/ipfs/go-merkledag;name=go-merkledag;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/ipfs/go-merkledag"

# github.com/ipfs/go-metrics-interface v0.0.1
@@ -499,9 +498,9 @@ SRC_URI += "git://github.com/ipld/go-ipld-prime;name=go-ipld-prime;protocol=http
SRCREV_goprocess="23d20c20149e1f362afda26f4500cb9d6393f0ad"
SRC_URI += "git://github.com/jbenet/goprocess;name=goprocess;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/jbenet/goprocess"

-# github.com/klauspost/compress v1.14.2
-# [1] git ls-remote https://github.com/klauspost/compress 7f260be218b66dc1c5b2d6be2d5c0925aa9a4a0d
-SRCREV_compress="7f260be218b66dc1c5b2d6be2d5c0925aa9a4a0d"
+# github.com/klauspost/compress v1.15.1
+# [1] git ls-remote https://github.com/klauspost/compress v1.15.1
+SRCREV_compress = "7c7079ec1ed2c07fd15e6f3f369dbae5288051d5"
SRC_URI += "git://github.com/klauspost/compress;name=compress;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/klauspost/compress"

# github.com/klauspost/cpuid/v2 v2.0.6
@@ -539,9 +538,9 @@ SRC_URI += "git://github.com/mattn/go-shellwords;name=go-shellwords;protocol=htt
SRCREV_golang_protobuf_extensions="c182affec369e30f25d3eb8cd8a478dee585ae7d"
SRC_URI += "git://github.com/matttproud/golang_protobuf_extensions;name=golang_protobuf_extensions;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/matttproud/golang_protobuf_extensions"

-# github.com/miekg/pkcs11 v1.0.3
-# [1] git ls-remote https://github.com/miekg/pkcs11 210dc1e16747c5ba98a03bcbcf728c38086ea357
-SRCREV_pkcs11="210dc1e16747c5ba98a03bcbcf728c38086ea357"
+# github.com/miekg/pkcs11 v1.1.1
+# [1] git ls-remote https://github.com/miekg/pkcs11 v1.1.1
+SRCREV_pkcs11 = "f3481918a208bd212aa995a41f92d786eb418a7d"
SRC_URI += "git://github.com/miekg/pkcs11;name=pkcs11;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/miekg/pkcs11"

# github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
@@ -634,9 +633,9 @@ SRC_URI += "git://github.com/pkg/errors;name=errors;protocol=https;nobranch=1;de
SRCREV_refmt="30ac6d18308e584ca6a2e74ba81475559db94c5f"
SRC_URI += "git://github.com/polydawn/refmt;name=refmt;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/polydawn/refmt"

-# github.com/prometheus/client_golang v1.12.0
-# [1] git ls-remote https://github.com/prometheus/client_golang 01087964d02726ef7438fdb19c2672e6e5d0b48a
-SRCREV_client_golang="01087964d02726ef7438fdb19c2672e6e5d0b48a"
+# github.com/prometheus/client_golang v1.12.1
+# [1] git ls-remote https://github.com/prometheus/client_golang v1.12.1
+SRCREV_client_golang = "2e1c4818ccfdcf953ce399cadad615ff2bed968c"
SRC_URI += "git://github.com/prometheus/client_golang;name=client_golang;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/client_golang"

# github.com/prometheus/client_model v0.2.0
@@ -754,9 +753,9 @@ SRC_URI += "git://go.googlesource.com/xerrors;name=xerrors;protocol=https;nobran
SRCREV_genproto="9970aeb2e350469c6bdc3e220a3ddecf38a85f61"
SRC_URI += "git://github.com/googleapis/go-genproto;name=genproto;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/google.golang.org/genproto"

-# google.golang.org/grpc v1.44.0
-# [1] git ls-remote https://github.com/grpc/grpc-go b4c5e24c7373b22c6c38d68379c39ecdc616a968
-SRCREV_grpc="b4c5e24c7373b22c6c38d68379c39ecdc616a968"
+# google.golang.org/grpc v1.45.0
+# [1] git ls-remote https://github.com/grpc/grpc-go v1.45.0
+SRCREV_grpc="a82cc96f07c960e02623688e4067ae6b7895334a"
SRC_URI += "git://github.com/grpc/grpc-go;name=grpc;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/google.golang.org/grpc"

# google.golang.org/protobuf v1.27.1
@@ -781,8 +780,6 @@ SRC_URI += "file://0001-Makefile-allow-external-specification-of-build-setti.pat
file://modules.txt \
"

-SRC_URI[sha256sum] = "d7b05a9bff34dfb25abe7e5b1e54cf2607f953d91cb33fb231a4775a1a4afa3d"
-
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

@@ -790,7 +787,7 @@ GO_IMPORT = "import"

# S = "${WORKDIR}/git"

-PV = "v0.17.0"
+PV = "v0.18.0"

NERDCTL_PKG = "github.com/containerd/nerdctl"

@@ -824,7 +821,7 @@ do_compile() {

# this moves all the fetches into the proper vendor structure
# expected for build
- sites="github.com/Microsoft/go-winio:github.com/Microsoft/go-winio github.com/compose-spec/compose-go:github.com/compose-spec/compose-go github.com/containerd/cgroups:github.com/containerd/cgroups github.com/containerd/console:github.com/containerd/console github.com/containerd/containerd:github.com/containerd/containerd github.com/containerd/continuity:github.com/containerd/continuity github.com/containerd/go-cni:github.com/containerd/go-cni github.com/containerd/imgcrypt:github.com/containerd/imgcrypt github.com/containerd/stargz-snapshotter:github.com/containerd/stargz-snapshotter github.com/containerd/stargz-snapshotter/estargz:github.com/containerd/stargz-snapshotter//estargz github.com/containerd/stargz-snapshotter/ipfs:github.com/containerd/stargz-snapshotter//ipfs github.com/containerd/typeurl:github.com/containerd/typeurl github.com/containernetworking/cni:github.com/containernetworking/cni github.com/containernetworking/plugins:github.com/containernetworking/plugins github.com/cyphar/filepath-securejoin:github.com/cyphar/filepath-securejoin github.com/docker/cli:github.com/docker/cli github.com/docker/docker:github.com/docker/docker github.com/docker/go-connections:github.com/docker/go-connections github.com/docker/go-units:github.com/docker/go-units github.com/fatih/color:github.com/fatih/color github.com/gogo/protobuf:github.com/gogo/protobuf github.com/hashicorp/go-multierror:github.com/hashicorp/go-multierror github.com/ipfs/go-cid:github.com/ipfs/go-cid github.com/ipfs/go-ipfs-files:github.com/ipfs/go-ipfs-files github.com/ipfs/go-ipfs-http-client:github.com/ipfs/go-ipfs-http-client github.com/ipfs/interface-go-ipfs-core:github.com/ipfs/interface-go-ipfs-core github.com/jaytaylor/go-hostsfile:github.com/jaytaylor/go-hostsfile github.com/mattn/go-isatty:github.com/mattn/go-isatty github.com/moby/sys/mount:github.com/moby/sys/mount//mount github.com/moby/sys/mountinfo:github.com/moby/sys/mount//mountinfo github.com/moby/sys/signal:github.com/moby/sys/mount//signal github.com/multiformats/go-multiaddr:github.com/multiformats/go-multiaddr github.com/opencontainers/go-digest:github.com/opencontainers/go-digest github.com/opencontainers/image-spec:github.com/opencontainers/image-spec github.com/opencontainers/runtime-spec:github.com/opencontainers/runtime-spec github.com/pelletier/go-toml:github.com/pelletier/go-toml github.com/rootless-containers/bypass4netns:github.com/rootless-containers/bypass4netns github.com/rootless-containers/rootlesskit:github.com/rootless-containers/rootlesskit github.com/sirupsen/logrus:github.com/sirupsen/logrus github.com/spf13/cobra:github.com/spf13/cobra github.com/spf13/pflag:github.com/spf13/pflag github.com/tidwall/gjson:github.com/tidwall/gjson github.com/vishvananda/netlink:github.com/vishvananda/netlink github.com/vishvananda/netns:github.com/vishvananda/netns golang.org/x/crypto:go.googlesource.com/crypto golang.org/x/net:go.googlesource.com/net golang.org/x/sync:go.googlesource.com/sync golang.org/x/sys:go.googlesource.com/sys golang.org/x/term:go.googlesource.com/term gopkg.in/yaml.v2:gopkg.in/yaml.v2 gotest.tools/v3:github.com/gotestyourself/gotest.tools/v3 github.com/Azure/go-ansiterm:github.com/Azure/go-ansiterm github.com/Microsoft/hcsshim:github.com/Microsoft/hcsshim github.com/beorn7/perks:github.com/beorn7/perks github.com/btcsuite/btcd:github.com/btcsuite/btcd github.com/cespare/xxhash/v2:github.com/cespare/xxhash/v2 github.com/cilium/ebpf:github.com/cilium/ebpf github.com/containerd/fifo:github.com/containerd/fifo github.com/containerd/ttrpc:github.com/containerd/ttrpc github.com/containers/ocicrypt:github.com/containers/ocicrypt github.com/coreos/go-systemd/v22:github.com/coreos/go-systemd/v22 github.com/cpuguy83/go-md2man/v2:github.com/cpuguy83/go-md2man/v2 github.com/crackcomm/go-gitignore:github.com/crackcomm/go-gitignore github.com/distribution/distribution/v3:github.com/distribution/distribution/v3 github.com/docker/distribution:github.com/docker/distribution github.com/docker/docker-credential-helpers:github.com/docker/docker-credential-helpers github.com/docker/go-events:github.com/docker/go-events github.com/docker/go-metrics:github.com/docker/go-metrics github.com/godbus/dbus/v5:github.com/godbus/dbus/v5 github.com/gogo/googleapis:github.com/gogo/googleapis github.com/golang/groupcache:github.com/golang/groupcache github.com/golang/protobuf:github.com/golang/protobuf github.com/google/go-cmp:github.com/google/go-cmp github.com/google/uuid:github.com/google/uuid github.com/gorilla/mux:github.com/gorilla/mux github.com/hashicorp/errwrap:github.com/hashicorp/errwrap github.com/hashicorp/golang-lru:github.com/hashicorp/golang-lru github.com/imdario/mergo:github.com/imdario/mergo github.com/inconshreveable/mousetrap:github.com/inconshreveable/mousetrap github.com/ipfs/bbloom:github.com/ipfs/bbloom github.com/ipfs/go-block-format:github.com/ipfs/go-block-format github.com/ipfs/go-blockservice:github.com/ipfs/go-blockservice github.com/ipfs/go-datastore:github.com/ipfs/go-datastore github.com/ipfs/go-ipfs-blockstore:github.com/ipfs/go-ipfs-blockstore github.com/ipfs/go-ipfs-cmds:github.com/ipfs/go-ipfs-cmds github.com/ipfs/go-ipfs-ds-help:github.com/ipfs/go-ipfs-ds-help github.com/ipfs/go-ipfs-exchange-interface:github.com/ipfs/go-ipfs-exchange-interface github.com/ipfs/go-ipfs-util:github.com/ipfs/go-ipfs-util github.com/ipfs/go-ipld-cbor:github.com/ipfs/go-ipld-cbor github.com/ipfs/go-ipld-format:github.com/ipfs/go-ipld-format github.com/ipfs/go-ipld-legacy:github.com/ipfs/go-ipld-legacy github.com/ipfs/go-log:github.com/ipfs/go-log github.com/ipfs/go-log/v2:github.com/ipfs/go-log/v2 github.com/ipfs/go-merkledag:github.com/ipfs/go-merkledag github.com/ipfs/go-metrics-interface:github.com/ipfs/go-metrics-interface github.com/ipfs/go-path:github.com/ipfs/go-path github.com/ipfs/go-unixfs:github.com/ipfs/go-unixfs github.com/ipfs/go-verifcid:github.com/ipfs/go-verifcid github.com/ipld/go-codec-dagpb:github.com/ipld/go-codec-dagpb github.com/ipld/go-ipld-prime:github.com/ipld/go-ipld-prime github.com/jbenet/goprocess:github.com/jbenet/goprocess github.com/klauspost/compress:github.com/klauspost/compress github.com/klauspost/cpuid/v2:github.com/klauspost/cpuid/v2 github.com/libp2p/go-buffer-pool:github.com/libp2p/go-buffer-pool github.com/libp2p/go-libp2p-core:github.com/libp2p/go-libp2p-core github.com/libp2p/go-openssl:github.com/libp2p/go-openssl github.com/mattn/go-colorable:github.com/mattn/go-colorable github.com/mattn/go-shellwords:github.com/mattn/go-shellwords github.com/matttproud/golang_protobuf_extensions:github.com/matttproud/golang_protobuf_extensions github.com/miekg/pkcs11:github.com/miekg/pkcs11 github.com/minio/blake2b-simd:github.com/minio/blake2b-simd github.com/minio/sha256-simd:github.com/minio/sha256-simd github.com/mitchellh/go-homedir:github.com/mitchellh/go-homedir github.com/mitchellh/mapstructure:github.com/mitchellh/mapstructure github.com/moby/locker:github.com/moby/locker github.com/moby/term:github.com/moby/term github.com/morikuni/aec:github.com/morikuni/aec github.com/mr-tron/base58:github.com/mr-tron/base58 github.com/multiformats/go-base32:github.com/multiformats/go-base32 github.com/multiformats/go-base36:github.com/multiformats/go-base36 github.com/multiformats/go-multibase:github.com/multiformats/go-multibase github.com/multiformats/go-multihash:github.com/multiformats/go-multihash github.com/multiformats/go-varint:github.com/multiformats/go-varint github.com/opencontainers/runc:github.com/opencontainers/runc github.com/opencontainers/selinux:github.com/opencontainers/selinux github.com/opentracing/opentracing-go:github.com/opentracing/opentracing-go github.com/pkg/errors:github.com/pkg/errors github.com/polydawn/refmt:github.com/polydawn/refmt github.com/prometheus/client_golang:github.com/prometheus/client_golang github.com/prometheus/client_model:github.com/prometheus/client_model github.com/prometheus/common:github.com/prometheus/common github.com/prometheus/procfs:github.com/prometheus/procfs github.com/rs/cors:github.com/rs/cors github.com/russross/blackfriday/v2:github.com/russross/blackfriday/v2 github.com/spacemonkeygo/spacelog:github.com/spacemonkeygo/spacelog github.com/stefanberger/go-pkcs11uri:github.com/stefanberger/go-pkcs11uri github.com/tidwall/match:github.com/tidwall/match github.com/tidwall/pretty:github.com/tidwall/pretty github.com/urfave/cli:github.com/urfave/cli github.com/vbatts/tar-split:github.com/vbatts/tar-split github.com/whyrusleeping/cbor-gen:github.com/whyrusleeping/cbor-gen github.com/xeipuuv/gojsonpointer:github.com/xeipuuv/gojsonpointer github.com/xeipuuv/gojsonreference:github.com/xeipuuv/gojsonreference github.com/xeipuuv/gojsonschema:github.com/xeipuuv/gojsonschema go.mozilla.org/pkcs7:go.mozilla.org/pkcs7 go.opencensus.io:go.opencensus.io go.uber.org/atomic:go.uber.org/atomic go.uber.org/multierr:go.uber.org/multierr go.uber.org/zap:go.uber.org/zap golang.org/x/text:go.googlesource.com/text golang.org/x/xerrors:go.googlesource.com/xerrors google.golang.org/genproto:google.golang.org/genproto google.golang.org/grpc:google.golang.org/grpc google.golang.org/protobuf:google.golang.org/protobuf gopkg.in/square/go-jose.v2:gopkg.in/square/go-jose.v2 github.com/hashicorp/golang-lru :github.com/hashicorp/golang-lru "
+ sites="github.com/Masterminds/semver/v3:github.com/Masterminds/semver/v3 github.com/Microsoft/go-winio:github.com/Microsoft/go-winio github.com/compose-spec/compose-go:github.com/compose-spec/compose-go github.com/containerd/cgroups:github.com/containerd/cgroups github.com/containerd/console:github.com/containerd/console github.com/containerd/containerd:github.com/containerd/containerd github.com/containerd/continuity:github.com/containerd/continuity github.com/containerd/go-cni:github.com/containerd/go-cni github.com/containerd/imgcrypt:github.com/containerd/imgcrypt github.com/containerd/stargz-snapshotter:github.com/containerd/stargz-snapshotter github.com/containerd/stargz-snapshotter/estargz:github.com/containerd/stargz-snapshotter//estargz github.com/containerd/stargz-snapshotter/ipfs:github.com/containerd/stargz-snapshotter//ipfs github.com/containerd/typeurl:github.com/containerd/typeurl github.com/containernetworking/cni:github.com/containernetworking/cni github.com/containernetworking/plugins:github.com/containernetworking/plugins github.com/cyphar/filepath-securejoin:github.com/cyphar/filepath-securejoin github.com/docker/cli:github.com/docker/cli github.com/docker/docker:github.com/docker/docker github.com/docker/go-connections:github.com/docker/go-connections github.com/docker/go-units:github.com/docker/go-units github.com/fatih/color:github.com/fatih/color github.com/gogo/protobuf:github.com/gogo/protobuf github.com/hashicorp/go-multierror:github.com/hashicorp/go-multierror github.com/ipfs/go-cid:github.com/ipfs/go-cid github.com/ipfs/go-ipfs-files:github.com/ipfs/go-ipfs-files github.com/ipfs/go-ipfs-http-client:github.com/ipfs/go-ipfs-http-client github.com/ipfs/interface-go-ipfs-core:github.com/ipfs/interface-go-ipfs-core github.com/mattn/go-isatty:github.com/mattn/go-isatty github.com/moby/sys/mount:github.com/moby/sys/mount//mount github.com/moby/sys/mountinfo:github.com/moby/sys/mount//mountinfo github.com/moby/sys/signal:github.com/moby/sys/mount//signal github.com/multiformats/go-multiaddr:github.com/multiformats/go-multiaddr github.com/opencontainers/go-digest:github.com/opencontainers/go-digest github.com/opencontainers/image-spec:github.com/opencontainers/image-spec github.com/opencontainers/runtime-spec:github.com/opencontainers/runtime-spec github.com/pelletier/go-toml:github.com/pelletier/go-toml github.com/rootless-containers/bypass4netns:github.com/rootless-containers/bypass4netns github.com/rootless-containers/rootlesskit:github.com/rootless-containers/rootlesskit github.com/sirupsen/logrus:github.com/sirupsen/logrus github.com/spf13/cobra:github.com/spf13/cobra github.com/spf13/pflag:github.com/spf13/pflag github.com/tidwall/gjson:github.com/tidwall/gjson github.com/vishvananda/netlink:github.com/vishvananda/netlink github.com/vishvananda/netns:github.com/vishvananda/netns golang.org/x/crypto:go.googlesource.com/crypto golang.org/x/net:go.googlesource.com/net golang.org/x/sync:go.googlesource.com/sync golang.org/x/sys:go.googlesource.com/sys golang.org/x/term:go.googlesource.com/term gopkg.in/yaml.v2:gopkg.in/yaml.v2 gotest.tools/v3:github.com/gotestyourself/gotest.tools/v3 github.com/Azure/go-ansiterm:github.com/Azure/go-ansiterm github.com/Microsoft/hcsshim:github.com/Microsoft/hcsshim github.com/beorn7/perks:github.com/beorn7/perks github.com/btcsuite/btcd:github.com/btcsuite/btcd github.com/cespare/xxhash/v2:github.com/cespare/xxhash/v2 github.com/cilium/ebpf:github.com/cilium/ebpf github.com/containerd/fifo:github.com/containerd/fifo github.com/containerd/ttrpc:github.com/containerd/ttrpc github.com/containers/ocicrypt:github.com/containers/ocicrypt github.com/coreos/go-systemd/v22:github.com/coreos/go-systemd/v22 github.com/cpuguy83/go-md2man/v2:github.com/cpuguy83/go-md2man/v2 github.com/crackcomm/go-gitignore:github.com/crackcomm/go-gitignore github.com/distribution/distribution/v3:github.com/distribution/distribution/v3 github.com/docker/distribution:github.com/docker/distribution github.com/docker/docker-credential-helpers:github.com/docker/docker-credential-helpers github.com/docker/go-events:github.com/docker/go-events github.com/docker/go-metrics:github.com/docker/go-metrics github.com/godbus/dbus/v5:github.com/godbus/dbus/v5 github.com/gogo/googleapis:github.com/gogo/googleapis github.com/golang/groupcache:github.com/golang/groupcache github.com/golang/protobuf:github.com/golang/protobuf github.com/google/go-cmp:github.com/google/go-cmp github.com/google/uuid:github.com/google/uuid github.com/gorilla/mux:github.com/gorilla/mux github.com/hashicorp/errwrap:github.com/hashicorp/errwrap github.com/hashicorp/golang-lru:github.com/hashicorp/golang-lru github.com/imdario/mergo:github.com/imdario/mergo github.com/inconshreveable/mousetrap:github.com/inconshreveable/mousetrap github.com/ipfs/bbloom:github.com/ipfs/bbloom github.com/ipfs/go-block-format:github.com/ipfs/go-block-format github.com/ipfs/go-blockservice:github.com/ipfs/go-blockservice github.com/ipfs/go-datastore:github.com/ipfs/go-datastore github.com/ipfs/go-ipfs-blockstore:github.com/ipfs/go-ipfs-blockstore github.com/ipfs/go-ipfs-cmds:github.com/ipfs/go-ipfs-cmds github.com/ipfs/go-ipfs-ds-help:github.com/ipfs/go-ipfs-ds-help github.com/ipfs/go-ipfs-exchange-interface:github.com/ipfs/go-ipfs-exchange-interface github.com/ipfs/go-ipfs-util:github.com/ipfs/go-ipfs-util github.com/ipfs/go-ipld-cbor:github.com/ipfs/go-ipld-cbor github.com/ipfs/go-ipld-format:github.com/ipfs/go-ipld-format github.com/ipfs/go-ipld-legacy:github.com/ipfs/go-ipld-legacy github.com/ipfs/go-log:github.com/ipfs/go-log github.com/ipfs/go-log/v2:github.com/ipfs/go-log/v2 github.com/ipfs/go-merkledag:github.com/ipfs/go-merkledag github.com/ipfs/go-metrics-interface:github.com/ipfs/go-metrics-interface github.com/ipfs/go-path:github.com/ipfs/go-path github.com/ipfs/go-unixfs:github.com/ipfs/go-unixfs github.com/ipfs/go-verifcid:github.com/ipfs/go-verifcid github.com/ipld/go-codec-dagpb:github.com/ipld/go-codec-dagpb github.com/ipld/go-ipld-prime:github.com/ipld/go-ipld-prime github.com/jbenet/goprocess:github.com/jbenet/goprocess github.com/klauspost/compress:github.com/klauspost/compress github.com/klauspost/cpuid/v2:github.com/klauspost/cpuid/v2 github.com/libp2p/go-buffer-pool:github.com/libp2p/go-buffer-pool github.com/libp2p/go-libp2p-core:github.com/libp2p/go-libp2p-core github.com/libp2p/go-openssl:github.com/libp2p/go-openssl github.com/mattn/go-colorable:github.com/mattn/go-colorable github.com/mattn/go-shellwords:github.com/mattn/go-shellwords github.com/matttproud/golang_protobuf_extensions:github.com/matttproud/golang_protobuf_extensions github.com/miekg/pkcs11:github.com/miekg/pkcs11 github.com/minio/blake2b-simd:github.com/minio/blake2b-simd github.com/minio/sha256-simd:github.com/minio/sha256-simd github.com/mitchellh/go-homedir:github.com/mitchellh/go-homedir github.com/mitchellh/mapstructure:github.com/mitchellh/mapstructure github.com/moby/locker:github.com/moby/locker github.com/moby/term:github.com/moby/term github.com/morikuni/aec:github.com/morikuni/aec github.com/mr-tron/base58:github.com/mr-tron/base58 github.com/multiformats/go-base32:github.com/multiformats/go-base32 github.com/multiformats/go-base36:github.com/multiformats/go-base36 github.com/multiformats/go-multibase:github.com/multiformats/go-multibase github.com/multiformats/go-multihash:github.com/multiformats/go-multihash github.com/multiformats/go-varint:github.com/multiformats/go-varint github.com/opencontainers/runc:github.com/opencontainers/runc github.com/opencontainers/selinux:github.com/opencontainers/selinux github.com/opentracing/opentracing-go:github.com/opentracing/opentracing-go github.com/pkg/errors:github.com/pkg/errors github.com/polydawn/refmt:github.com/polydawn/refmt github.com/prometheus/client_golang:github.com/prometheus/client_golang github.com/prometheus/client_model:github.com/prometheus/client_model github.com/prometheus/common:github.com/prometheus/common github.com/prometheus/procfs:github.com/prometheus/procfs github.com/rs/cors:github.com/rs/cors github.com/russross/blackfriday/v2:github.com/russross/blackfriday/v2 github.com/spacemonkeygo/spacelog:github.com/spacemonkeygo/spacelog github.com/stefanberger/go-pkcs11uri:github.com/stefanberger/go-pkcs11uri github.com/tidwall/match:github.com/tidwall/match github.com/tidwall/pretty:github.com/tidwall/pretty github.com/urfave/cli:github.com/urfave/cli github.com/vbatts/tar-split:github.com/vbatts/tar-split github.com/whyrusleeping/cbor-gen:github.com/whyrusleeping/cbor-gen github.com/xeipuuv/gojsonpointer:github.com/xeipuuv/gojsonpointer github.com/xeipuuv/gojsonreference:github.com/xeipuuv/gojsonreference github.com/xeipuuv/gojsonschema:github.com/xeipuuv/gojsonschema go.mozilla.org/pkcs7:go.mozilla.org/pkcs7 go.opencensus.io:go.opencensus.io go.uber.org/atomic:go.uber.org/atomic go.uber.org/multierr:go.uber.org/multierr go.uber.org/zap:go.uber.org/zap golang.org/x/text:go.googlesource.com/text golang.org/x/xerrors:go.googlesource.com/xerrors google.golang.org/genproto:google.golang.org/genproto google.golang.org/grpc:google.golang.org/grpc google.golang.org/protobuf:google.golang.org/protobuf gopkg.in/square/go-jose.v2:gopkg.in/square/go-jose.v2 github.com/hashicorp/golang-lru :github.com/hashicorp/golang-lru "
for s in $sites; do
site_dest=$(echo $s | cut -d: -f1)
site_source=$(echo $s | cut -d: -f2)
--
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: nerdctl

Bruce Ashfield
 

On Mon, Apr 18, 2022 at 2:17 AM ChenQi <Qi.Chen@...> wrote:

Hi Bruce and Joakim,

I'm recently looking into this nerdctl recipe. I'm kind of shocked by
the SRC_URI number in this recipe.
k3s is much, much worse.

Looking at the discussion on the mailing list (go.bbclass: Allow network
Right, we need this for licensing, SBOM, reproducibility, etc. As you
say, there's a shocking amount of code/dependencies that are fetched
for a lot of these recipes. The version management and scaling of them
to individual recipes would be nearly impossible .. so this is my
current effort :)

in do_compile), it seems that they are needed for offline build for this
recipe.
Yes, they are (almost) all required (indirect dependency generation
isn't exact at times, so there may be a few extras that aren't used in
some build configurations).

Bruce, how do you get all these contents? Also, how do you generate the
modules.txt file? You mentioned some helping script in the discussion,
what's the status of that script?
The tool is still a WIP, once we get past the current release, I'm
going to complete the cleanup and make it more widely available. It
currently isn't really usable.

The script generates the SRC_URI, the modules.txt and the vendor/
relocation parts of the recipe.


Joakim, maybe I misunderstood it, but are you still working on an
upgrade of this recipe? If not, I'm going to try to do it.
I have an in progress update here.

I'm using it to test the script in that mode, I should have the update
available in the next little while, and then the script that generates
it will follow.

Cheers,

Bruce


Last but not least, Bruce, thank you again for making this recipe work.

Regards,
Qi

On 3/7/22 15:30, Joakim Roubert wrote:
On 2022-03-04 16:48, Bruce Ashfield wrote:

It took several months, but:

root@qemux86-64:~# uname -a
Linux qemux86-64 5.17.0-rc6-yoctodev-standard #1 SMP PREEMPT Sun Feb
27 22:36:33 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
root@qemux86-64:~# nerdctl --version
nerdctl version 0.17.0-10-gf2427ff.m
root@qemux86-64:~#
Really cool!!!

The recipe isn't available yet, since this is using a huge amount of
fetched go dependencies, using some new scripts/tooling that I created
.. but at least I know the approach is feasible!
Excellent news!

BR,

/Joakim



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