Date   

Re: [PATCH 1/3] podman: Add seccomp as REQUIRED_DISTRO_FEATURES

Bruce Ashfield
 

On Fri, Jun 25, 2021 at 4:11 AM Diego Sueiro <Diego.Sueiro@...> wrote:

-----Original Message-----
From: Bruce Ashfield <bruce.ashfield@...>
Sent: 25 June 2021 03:49
To: Martin Jansa <martin.jansa@...>
Cc: Diego Sueiro <Diego.Sueiro@...>; meta-
virtualization@...; nd <nd@...>
Subject: Re: [meta-virtualization][PATCH 1/3] podman: Add seccomp as
REQUIRED_DISTRO_FEATURES

On Thu, Jun 24, 2021 at 5:01 PM Martin Jansa <martin.jansa@...>
wrote:

This change is correct, libseccomp still requires seccomp in
DISTRO_FEATURES, so anything depending on it should have the same
restriction.
Right, I understand how/why it works like this .. but it is super clunky when we
can't just depend on something that is now in core, without needing to
sprinkle distro checks everywhere.

As the list of recipes gets larger with that check, it really isn't an optional distro
feature for using meta virt at all, and it would be nice if we could just do the
check once and be done with it.
Just a side note that these patches fix issues with yocto-check-layer.
I've disagreed with check-layer before (and we've changed how it works)

That being said, the layer is checked on the AB, and Richard hasn't
reported any issues. So clearly there's something wrong with the AB
test or with something else.

Bruce


Diego


Bruce

seccomp is now in default DISTRO_FEATURES, but not through BACKFILL
feature, so many existing DISTROs didn't get it automatically added and
requiring it is the right way to automatically skip such recipes.

On Thu, Jun 24, 2021 at 12:45 PM Bruce Ashfield
<bruce.ashfield@...> wrote:

What branch are you working with ?

Now that seccomp is in core, we no longer have those restrictions, so
I assume this is on an older branch ?

Bruce

On Thu, Jun 24, 2021 at 3:00 PM Diego Sueiro <diego.sueiro@...>
wrote:

The libseccomp package is only available if seccomp is in
DISTRO_FEATURES.

Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
recipes-containers/podman/podman_git.bb | 3 +++
1 file changed, 3 insertions(+)

diff --git a/recipes-containers/podman/podman_git.bb
b/recipes-containers/podman/podman_git.bb
index 9dcb21c..351f38b 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -6,6 +6,9 @@ DESCRIPTION = "Podman is a daemonless container
engine for developing, \
`alias docker=podman`. \
"

+inherit features_check
+REQUIRED_DISTRO_FEATURES ?= "seccomp"
+
DEPENDS = " \
go-metalinter-native \
go-md2man-native \
--
2.17.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 1/3] podman: Add seccomp as REQUIRED_DISTRO_FEATURES

Diego Sueiro
 

-----Original Message-----
From: Bruce Ashfield <bruce.ashfield@...>
Sent: 25 June 2021 03:49
To: Martin Jansa <martin.jansa@...>
Cc: Diego Sueiro <Diego.Sueiro@...>; meta-
virtualization@...; nd <nd@...>
Subject: Re: [meta-virtualization][PATCH 1/3] podman: Add seccomp as
REQUIRED_DISTRO_FEATURES

On Thu, Jun 24, 2021 at 5:01 PM Martin Jansa <martin.jansa@...>
wrote:

This change is correct, libseccomp still requires seccomp in
DISTRO_FEATURES, so anything depending on it should have the same
restriction.
Right, I understand how/why it works like this .. but it is super clunky when we
can't just depend on something that is now in core, without needing to
sprinkle distro checks everywhere.

As the list of recipes gets larger with that check, it really isn't an optional distro
feature for using meta virt at all, and it would be nice if we could just do the
check once and be done with it.
Just a side note that these patches fix issues with yocto-check-layer.

Diego


Bruce

seccomp is now in default DISTRO_FEATURES, but not through BACKFILL
feature, so many existing DISTROs didn't get it automatically added and
requiring it is the right way to automatically skip such recipes.

On Thu, Jun 24, 2021 at 12:45 PM Bruce Ashfield
<bruce.ashfield@...> wrote:

What branch are you working with ?

Now that seccomp is in core, we no longer have those restrictions, so
I assume this is on an older branch ?

Bruce

On Thu, Jun 24, 2021 at 3:00 PM Diego Sueiro <diego.sueiro@...>
wrote:

The libseccomp package is only available if seccomp is in
DISTRO_FEATURES.

Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
recipes-containers/podman/podman_git.bb | 3 +++
1 file changed, 3 insertions(+)

diff --git a/recipes-containers/podman/podman_git.bb
b/recipes-containers/podman/podman_git.bb
index 9dcb21c..351f38b 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -6,6 +6,9 @@ DESCRIPTION = "Podman is a daemonless container
engine for developing, \
`alias docker=podman`. \
"

+inherit features_check
+REQUIRED_DISTRO_FEATURES ?= "seccomp"
+
DEPENDS = " \
go-metalinter-native \
go-md2man-native \
--
2.17.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 1/3] podman: Add seccomp as REQUIRED_DISTRO_FEATURES

Bruce Ashfield
 

On Thu, Jun 24, 2021 at 5:01 PM Martin Jansa <martin.jansa@...> wrote:

This change is correct, libseccomp still requires seccomp in DISTRO_FEATURES, so anything depending on it should have the same restriction.
Right, I understand how/why it works like this .. but it is super
clunky when we can't just depend on something that is now in core,
without needing to sprinkle distro checks everywhere.

As the list of recipes gets larger with that check, it really isn't an
optional distro feature for using meta virt at all, and it would be
nice if we could just do the check once and be done with it.

Bruce

seccomp is now in default DISTRO_FEATURES, but not through BACKFILL feature, so many existing DISTROs didn't get it automatically added and requiring it is the right way to automatically skip such recipes.

On Thu, Jun 24, 2021 at 12:45 PM Bruce Ashfield <bruce.ashfield@...> wrote:

What branch are you working with ?

Now that seccomp is in core, we no longer have those restrictions, so
I assume this is on an older branch ?

Bruce

On Thu, Jun 24, 2021 at 3:00 PM Diego Sueiro <diego.sueiro@...> wrote:

The libseccomp package is only available if seccomp is in DISTRO_FEATURES.

Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
recipes-containers/podman/podman_git.bb | 3 +++
1 file changed, 3 insertions(+)

diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 9dcb21c..351f38b 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -6,6 +6,9 @@ DESCRIPTION = "Podman is a daemonless container engine for developing, \
`alias docker=podman`. \
"

+inherit features_check
+REQUIRED_DISTRO_FEATURES ?= "seccomp"
+
DEPENDS = " \
go-metalinter-native \
go-md2man-native \
--
2.17.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 1/3] podman: Add seccomp as REQUIRED_DISTRO_FEATURES

Martin Jansa
 

This change is correct, libseccomp still requires seccomp in DISTRO_FEATURES, so anything depending on it should have the same restriction.

seccomp is now in default DISTRO_FEATURES, but not through BACKFILL feature, so many existing DISTROs didn't get it automatically added and requiring it is the right way to automatically skip such recipes.

On Thu, Jun 24, 2021 at 12:45 PM Bruce Ashfield <bruce.ashfield@...> wrote:
What branch are you working with ?

Now that seccomp is in core, we no longer have those restrictions, so
I assume this is on an older branch ?

Bruce

On Thu, Jun 24, 2021 at 3:00 PM Diego Sueiro <diego.sueiro@...> wrote:
>
> The libseccomp package is only available if seccomp is in DISTRO_FEATURES.
>
> Signed-off-by: Diego Sueiro <diego.sueiro@...>
> ---
>  recipes-containers/podman/podman_git.bb | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
> index 9dcb21c..351f38b 100644
> --- a/recipes-containers/podman/podman_git.bb
> +++ b/recipes-containers/podman/podman_git.bb
> @@ -6,6 +6,9 @@ DESCRIPTION = "Podman is a daemonless container engine for developing, \
>      `alias docker=podman`. \
>      "
>
> +inherit features_check
> +REQUIRED_DISTRO_FEATURES ?= "seccomp"
> +
>  DEPENDS = " \
>      go-metalinter-native \
>      go-md2man-native \
> --
> 2.17.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 1/3] podman: Add seccomp as REQUIRED_DISTRO_FEATURES

Bruce Ashfield
 

On Thu, Jun 24, 2021 at 3:45 PM Bruce Ashfield via
lists.yoctoproject.org
<bruce.ashfield=gmail.com@...> wrote:

What branch are you working with ?

Now that seccomp is in core, we no longer have those restrictions, so
I assume this is on an older branch ?
aha. never mind, I misread the change.

That being said, I honestly think this is a bug. If the main
libseccomp is dependent on a distro feature, each and every recipe
that has a hard dependency on it, should not have to do the distro
check.

so for now, I'm going to not apply these while I look for a better method.

Bruce


Bruce

On Thu, Jun 24, 2021 at 3:00 PM Diego Sueiro <diego.sueiro@...> wrote:

The libseccomp package is only available if seccomp is in DISTRO_FEATURES.

Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
recipes-containers/podman/podman_git.bb | 3 +++
1 file changed, 3 insertions(+)

diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 9dcb21c..351f38b 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -6,6 +6,9 @@ DESCRIPTION = "Podman is a daemonless container engine for developing, \
`alias docker=podman`. \
"

+inherit features_check
+REQUIRED_DISTRO_FEATURES ?= "seccomp"
+
DEPENDS = " \
go-metalinter-native \
go-md2man-native \
--
2.17.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 1/3] podman: Add seccomp as REQUIRED_DISTRO_FEATURES

Bruce Ashfield
 

What branch are you working with ?

Now that seccomp is in core, we no longer have those restrictions, so
I assume this is on an older branch ?

Bruce

On Thu, Jun 24, 2021 at 3:00 PM Diego Sueiro <diego.sueiro@...> wrote:

The libseccomp package is only available if seccomp is in DISTRO_FEATURES.

Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
recipes-containers/podman/podman_git.bb | 3 +++
1 file changed, 3 insertions(+)

diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 9dcb21c..351f38b 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -6,6 +6,9 @@ DESCRIPTION = "Podman is a daemonless container engine for developing, \
`alias docker=podman`. \
"

+inherit features_check
+REQUIRED_DISTRO_FEATURES ?= "seccomp"
+
DEPENDS = " \
go-metalinter-native \
go-md2man-native \
--
2.17.1



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


[PATCH 3/3] slirp4netns: Add seccomp as REQUIRED_DISTRO_FEATURES

Diego Sueiro
 

The libseccomp package is only available if seccomp is in DISTRO_FEATURES.

Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
recipes-networking/slirp4netns/slirp4netns_0.4.1.bb | 3 +++
1 file changed, 3 insertions(+)

diff --git a/recipes-networking/slirp4netns/slirp4netns_0.4.1.bb b/recipes-networking/slirp4netns/slirp4netns_0.4.1.bb
index b47df96..6349aac 100644
--- a/recipes-networking/slirp4netns/slirp4netns_0.4.1.bb
+++ b/recipes-networking/slirp4netns/slirp4netns_0.4.1.bb
@@ -9,6 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1e2efd29c201480c6be2744d9edade26"
SRCREV = "4d38845e2e311b684fc8d1c775c725bfcd5ddc27"
SRC_URI = "git://github.com/rootless-containers/slirp4netns.git;nobranch=1"

+inherit features_check
+REQUIRED_DISTRO_FEATURES ?= "seccomp"
+
DEPENDS = "glib-2.0 libcap libseccomp"

S = "${WORKDIR}/git"
--
2.17.1


[PATCH 2/3] packagegroup-container: Include podman if seccomp is in DISTRO_FEATURES

Diego Sueiro
 

Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
recipes-core/packagegroups/packagegroup-container.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
index d425ac5..89b9c01 100644
--- a/recipes-core/packagegroups/packagegroup-container.bb
+++ b/recipes-core/packagegroups/packagegroup-container.bb
@@ -9,7 +9,8 @@ PACKAGES = "\
packagegroup-lxc \
packagegroup-docker \
packagegroup-oci \
- packagegroup-podman \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', \
+ 'packagegroup-podman', '', d)} \
packagegroup-containerd \
"

--
2.17.1


[PATCH 1/3] podman: Add seccomp as REQUIRED_DISTRO_FEATURES

Diego Sueiro
 

The libseccomp package is only available if seccomp is in DISTRO_FEATURES.

Signed-off-by: Diego Sueiro <diego.sueiro@...>
---
recipes-containers/podman/podman_git.bb | 3 +++
1 file changed, 3 insertions(+)

diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 9dcb21c..351f38b 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -6,6 +6,9 @@ DESCRIPTION = "Podman is a daemonless container engine for developing, \
`alias docker=podman`. \
"

+inherit features_check
+REQUIRED_DISTRO_FEATURES ?= "seccomp"
+
DEPENDS = " \
go-metalinter-native \
go-md2man-native \
--
2.17.1


Re: [PATCH] conmon: add dependency on libseccomp and seccomp to REQUIRED_DISTRO_FEATURES

Bruce Ashfield
 

Thanks Martin,

This is now merged.

Bruce

On Wed, Jun 23, 2021 at 12:35 PM Martin Jansa <Martin.Jansa@...> wrote:

* added with to v2.0.29 commit:
106cad5 seccomp: add support for seccomp notify
* fixes:
| src/seccomp_notify.c:9:10: fatal error: seccomp.h: No such file or directory
| 9 | #include <seccomp.h>
| | ^~~~~~~~~~~

Signed-off-by: Martin Jansa <Martin.Jansa@...>
---
recipes-containers/conmon/conmon_git.bb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-containers/conmon/conmon_git.bb b/recipes-containers/conmon/conmon_git.bb
index 5c45ce0..e2f452c 100644
--- a/recipes-containers/conmon/conmon_git.bb
+++ b/recipes-containers/conmon/conmon_git.bb
@@ -4,7 +4,10 @@ HOMEPAGE = "https://github.com/containers/conmon"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77"

-DEPENDS = "glib-2.0 go-md2man-native"
+inherit features_check
+REQUIRED_DISTRO_FEATURES ?= "seccomp"
+
+DEPENDS = "glib-2.0 go-md2man-native libseccomp"

SRCREV = "1ef246896b4f6566964ed861b98cd32d0e7bf7a2"
SRC_URI = "\
--
2.30.2



--
- 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] skopeo: add native and nativesdk support

Bruce Ashfield
 

merged

Bruce

On Tue, Jun 22, 2021 at 5:55 AM Xu, Yanfei <yanfei.xu@...> wrote:

1.Add native and nativesdk support.

2.Replace "multipath-tools" with "libdevmapper" and "lvm2". Because
the really direct DEPENDS package is "libdevmapper" and "lvm2". Log
of do_comopile as below:

-----------------[cut here]---------------------
DEBUG: Executing shell function do_compile
NOTE: make -j 40 BUILDTAGS= bin/skopeo
CGO_CFLAGS="-I/...../usr/include"
CGO_LDFLAGS="-L/...../usr/lib
-lgpgme -lgpg-error -lassuan" GO111MODULE=on go build -mod=vendor
"-buildmode=pie" -ldflags '-X
main.gitCommit=8efffce8befc2de87670ba75d6c86ada61e869fd ' -gcflags ""
-tags "" -o bin/skopeo ./cmd/skopeo
Package devmapper was not found in the pkg-config search path.
Perhaps you should add the directory containing `devmapper.pc'
to the PKG_CONFIG_PATH environment variable
No package 'devmapper' found
pkg-config: exit status 1
make: *** [Makefile:134: bin/skopeo] Error 2

Signed-off-by: Yanfei Xu <yanfei.xu@...>
---
recipes-containers/skopeo/skopeo_git.bb | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
index 2c292463..6c95bf3e 100644
--- a/recipes-containers/skopeo/skopeo_git.bb
+++ b/recipes-containers/skopeo/skopeo_git.bb
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=7e611105d3e369954840a6668c4385

DEPENDS = " \
gpgme \
- multipath-tools \
+ libdevmapper \
+ lvm2 \
btrfs-tools \
glib-2.0 \
ostree \
@@ -80,4 +81,16 @@ do_install() {
install ${WORKDIR}/registries.conf ${D}/${sysconfdir}/containers/registries.conf
}

+do_install_append_class-native() {
+ create_cmdline_wrapper ${D}/${sbindir}/skopeo \
+ --policy ${sysconfdir}/containers/policy.json
+}
+
+do_install_append_class-nativesdk() {
+ create_cmdline_wrapper ${D}/${sbindir}/skopeo \
+ --policy ${sysconfdir}/containers/policy.json
+}
+
INSANE_SKIP_${PN} += "ldflags"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.27.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


[PATCH] conmon: add dependency on libseccomp and seccomp to REQUIRED_DISTRO_FEATURES

Martin Jansa
 

* added with to v2.0.29 commit:
106cad5 seccomp: add support for seccomp notify
* fixes:
| src/seccomp_notify.c:9:10: fatal error: seccomp.h: No such file or directory
| 9 | #include <seccomp.h>
| | ^~~~~~~~~~~

Signed-off-by: Martin Jansa <Martin.Jansa@...>
---
recipes-containers/conmon/conmon_git.bb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-containers/conmon/conmon_git.bb b/recipes-containers/conmon/conmon_git.bb
index 5c45ce0..e2f452c 100644
--- a/recipes-containers/conmon/conmon_git.bb
+++ b/recipes-containers/conmon/conmon_git.bb
@@ -4,7 +4,10 @@ HOMEPAGE = "https://github.com/containers/conmon"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77"

-DEPENDS = "glib-2.0 go-md2man-native"
+inherit features_check
+REQUIRED_DISTRO_FEATURES ?= "seccomp"
+
+DEPENDS = "glib-2.0 go-md2man-native libseccomp"

SRCREV = "1ef246896b4f6566964ed861b98cd32d0e7bf7a2"
SRC_URI = "\
--
2.30.2


[PATCH] skopeo: add native and nativesdk support

Xu, Yanfei
 

1.Add native and nativesdk support.

2.Replace "multipath-tools" with "libdevmapper" and "lvm2". Because
the really direct DEPENDS package is "libdevmapper" and "lvm2". Log
of do_comopile as below:

-----------------[cut here]---------------------
DEBUG: Executing shell function do_compile
NOTE: make -j 40 BUILDTAGS= bin/skopeo
CGO_CFLAGS="-I/...../usr/include"
CGO_LDFLAGS="-L/...../usr/lib
-lgpgme -lgpg-error -lassuan" GO111MODULE=on go build -mod=vendor
"-buildmode=pie" -ldflags '-X
main.gitCommit=8efffce8befc2de87670ba75d6c86ada61e869fd ' -gcflags ""
-tags "" -o bin/skopeo ./cmd/skopeo
Package devmapper was not found in the pkg-config search path.
Perhaps you should add the directory containing `devmapper.pc'
to the PKG_CONFIG_PATH environment variable
No package 'devmapper' found
pkg-config: exit status 1
make: *** [Makefile:134: bin/skopeo] Error 2

Signed-off-by: Yanfei Xu <yanfei.xu@...>
---
recipes-containers/skopeo/skopeo_git.bb | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
index 2c292463..6c95bf3e 100644
--- a/recipes-containers/skopeo/skopeo_git.bb
+++ b/recipes-containers/skopeo/skopeo_git.bb
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=7e611105d3e369954840a6668c4385

DEPENDS = " \
gpgme \
- multipath-tools \
+ libdevmapper \
+ lvm2 \
btrfs-tools \
glib-2.0 \
ostree \
@@ -80,4 +81,16 @@ do_install() {
install ${WORKDIR}/registries.conf ${D}/${sysconfdir}/containers/registries.conf
}

+do_install_append_class-native() {
+ create_cmdline_wrapper ${D}/${sbindir}/skopeo \
+ --policy ${sysconfdir}/containers/policy.json
+}
+
+do_install_append_class-nativesdk() {
+ create_cmdline_wrapper ${D}/${sbindir}/skopeo \
+ --policy ${sysconfdir}/containers/policy.json
+}
+
INSANE_SKIP_${PN} += "ldflags"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.27.0


Re: [PATCH] umoci: add nativesdk to BBCLASSEXTEND

Bruce Ashfield
 

merged

Bruce

On Wed, Jun 16, 2021 at 3:42 AM Xu, Yanfei <yanfei.xu@...> wrote:

add nativesdk to BBCLASSEXTEND

Signed-off-by: Yanfei Xu <yanfei.xu@...>
---
recipes-containers/umoci/umoci_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/umoci/umoci_git.bb b/recipes-containers/umoci/umoci_git.bb
index 7cd147b2..f83a35a7 100644
--- a/recipes-containers/umoci/umoci_git.bb
+++ b/recipes-containers/umoci/umoci_git.bb
@@ -77,4 +77,4 @@ do_install() {
}

INSANE_SKIP_${PN} += "ldflags already-stripped"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
--
2.27.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 1/2] crun: branch "master" renamed to "main"

Bruce Ashfield
 

Thanks for the fix!

I had made the same changes over the weekend, and coupled them with
bumps to the recipes. They are now pushed to the repo (and the branch
changes cherry picked to older releases).

Bruce

On Mon, Jun 21, 2021 at 7:44 AM Holger Assmann <h.assmann@...> wrote:

crun "master" branch has been renamed to "main", so change SRC_URI
accordingly.

Signed-off-by: Holger Assmann <h.assmann@...>
---
recipes-containers/crun/crun_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/crun/crun_git.bb b/recipes-containers/crun/crun_git.bb
index ced1e1c..ed2c5b0 100644
--- a/recipes-containers/crun/crun_git.bb
+++ b/recipes-containers/crun/crun_git.bb
@@ -9,7 +9,7 @@ SRCREV_ispec = "79b036d80240ae530a8de15e1d21c7ab9292c693"
SRCREV_rspec = "7413a7f753e1bd9a6a9c6dc7f96f55888cbbd476"

SRCREV_FORMAT = "crun_rspec"
-SRC_URI = "git://github.com/containers/crun.git;branch=master;name=crun \
+SRC_URI = "git://github.com/containers/crun.git;branch=main;name=crun \
git://github.com/containers/libocispec.git;branch=main;name=libocispec;destsuffix=git/libocispec \
git://github.com/opencontainers/runtime-spec.git;branch=master;name=rspec;destsuffix=git/libocispec/runtime-spec \
git://github.com/opencontainers/image-spec.git;branch=master;name=ispec;destsuffix=git/libocispec/image-spec \
--
2.29.2



--
- 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] conmon: switch to main branch

Bruce Ashfield
 

Thanks for the change.

I had done the same myself over the weekend, but was still doing a few tests.

I pushed the change this morning, and have also cherry picked it to
older releases.

Bruce

On Mon, Jun 21, 2021 at 1:41 AM Yu, Mingli <mingli.yu@...> wrote:

From: Mingli Yu <mingli.yu@...>

Switch to main branch to fix do_fetch error.

Signed-off-by: Mingli Yu <mingli.yu@...>
---
recipes-containers/conmon/conmon_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/conmon/conmon_git.bb b/recipes-containers/conmon/conmon_git.bb
index 74f5bfa..974eb07 100644
--- a/recipes-containers/conmon/conmon_git.bb
+++ b/recipes-containers/conmon/conmon_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 go-md2man-native"

SRCREV = "31614525ebc5fd9668a6e084b5638d71b903bf6d"
SRC_URI = "\
- git://github.com/containers/conmon.git \
+ git://github.com/containers/conmon.git;branch=main \
"

PV = "2.0.28+git${SRCPV}"
--
2.29.2



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


[PATCH 2/2] conmon: branch "master" renamed to "main"

Holger Assmann
 

Without further parametrization, do_fetch tries do access the source via
the "master" branch of the respective repository. Since this branch has
been renamed to "main", further specification has become necessary.

Signed-off-by: Holger Assmann <h.assmann@...>
---
recipes-containers/conmon/conmon_2.0.18.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/conmon/conmon_2.0.18.bb b/recipes-containers/conmon/conmon_2.0.18.bb
index d0a5739..b5c229d 100644
--- a/recipes-containers/conmon/conmon_2.0.18.bb
+++ b/recipes-containers/conmon/conmon_2.0.18.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 go-md2man-native"

SRCREV = "0e155c83aa739ef0a0540ec9f9d265f57f68038b"
SRC_URI = "\
- git://github.com/containers/conmon.git \
+ git://github.com/containers/conmon.git;branch=main \
"

PV = "2.0.26+git${SRCPV}"
--
2.29.2


[PATCH 1/2] crun: branch "master" renamed to "main"

Holger Assmann
 

crun "master" branch has been renamed to "main", so change SRC_URI
accordingly.

Signed-off-by: Holger Assmann <h.assmann@...>
---
recipes-containers/crun/crun_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/crun/crun_git.bb b/recipes-containers/crun/crun_git.bb
index ced1e1c..ed2c5b0 100644
--- a/recipes-containers/crun/crun_git.bb
+++ b/recipes-containers/crun/crun_git.bb
@@ -9,7 +9,7 @@ SRCREV_ispec = "79b036d80240ae530a8de15e1d21c7ab9292c693"
SRCREV_rspec = "7413a7f753e1bd9a6a9c6dc7f96f55888cbbd476"

SRCREV_FORMAT = "crun_rspec"
-SRC_URI = "git://github.com/containers/crun.git;branch=master;name=crun \
+SRC_URI = "git://github.com/containers/crun.git;branch=main;name=crun \
git://github.com/containers/libocispec.git;branch=main;name=libocispec;destsuffix=git/libocispec \
git://github.com/opencontainers/runtime-spec.git;branch=master;name=rspec;destsuffix=git/libocispec/runtime-spec \
git://github.com/opencontainers/image-spec.git;branch=master;name=ispec;destsuffix=git/libocispec/image-spec \
--
2.29.2


[PATCH] conmon: switch to main branch

Yu, Mingli
 

From: Mingli Yu <mingli.yu@...>

Switch to main branch to fix do_fetch error.

Signed-off-by: Mingli Yu <mingli.yu@...>
---
recipes-containers/conmon/conmon_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/conmon/conmon_git.bb b/recipes-containers/conmon/conmon_git.bb
index 74f5bfa..974eb07 100644
--- a/recipes-containers/conmon/conmon_git.bb
+++ b/recipes-containers/conmon/conmon_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 go-md2man-native"

SRCREV = "31614525ebc5fd9668a6e084b5638d71b903bf6d"
SRC_URI = "\
- git://github.com/containers/conmon.git \
+ git://github.com/containers/conmon.git;branch=main \
"

PV = "2.0.28+git${SRCPV}"
--
2.29.2


[PATCH] umoci: add nativesdk to BBCLASSEXTEND

Xu, Yanfei
 

add nativesdk to BBCLASSEXTEND

Signed-off-by: Yanfei Xu <yanfei.xu@...>
---
recipes-containers/umoci/umoci_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/umoci/umoci_git.bb b/recipes-containers/umoci/umoci_git.bb
index 7cd147b2..f83a35a7 100644
--- a/recipes-containers/umoci/umoci_git.bb
+++ b/recipes-containers/umoci/umoci_git.bb
@@ -77,4 +77,4 @@ do_install() {
}

INSANE_SKIP_${PN} += "ldflags already-stripped"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
--
2.27.0

961 - 980 of 7539