Date   

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


Re: [cni] do_compile network issue behind proxy for Hardknott

Joakim Roubert
 

On 2021-06-15 14:10, Bruce Ashfield wrote:
I have a note written on the paper in front of me "fix cni build for
no-network", and a half started fix. :D
:-D

Let me dig up my changs and see how far away they are from being ready for test.
Awesome, thanks! I will be more than happy to evaluate such changes here in my builds.

BR,

/Joakim


Re: [cni] do_compile network issue behind proxy for Hardknott

Bruce Ashfield
 

On Tue, Jun 15, 2021 at 7:31 AM Joakim Roubert <joakim.roubert@...> wrote:

Hi!

After upgrade to Hardknott from Gatesgarth, building cni on a machine
behind a proxy gives me network errors:

run.do_compile.18062' failed with exit code 1: go:
github.com/onsi/ginkgo@...: Get
"https://proxy.golang.org/github.com/onsi/ginkgo/@v/v1.13.0.mod": dial
tcp 142.250.74.81:443: connect: network is unreachable

The command that fails is

https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/tree/recipes-networking/cni/cni_git.bb?h=hardknott&id=6c9b889224cedd42191ef5edc7e1f37b0c8ecfec#n37

and can be mitigated by explicitly setting the proxy environment
variable on that line:

http_proxy=http://<myproxyserver>:<proxyport>
https_proxy=http://<myproxyserver>:<proxyport> ${GO} build

Since building with Gatesgarth (where that line is the same in the
recipe, but the cni version 0.7 instead of 0.8) worked fine I did not
expect this to happen. Do you guys have any ideas? (Setting the
environment variable as describe above does not strike me as the
proper/best solution...)
I have a note written on the paper in front of me "fix cni build for
no-network", and a half started fix. :D

So yes, cni is doing some fetches, due to missing go dependencies and
trying to do a go.mod build. Neither of which we want.

Let me dig up my changs and see how far away they are from being ready for test.

Bruce


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


[cni] do_compile network issue behind proxy for Hardknott

Joakim Roubert
 

Hi!

After upgrade to Hardknott from Gatesgarth, building cni on a machine behind a proxy gives me network errors:

run.do_compile.18062' failed with exit code 1: go: github.com/onsi/ginkgo@...: Get "https://proxy.golang.org/github.com/onsi/ginkgo/@v/v1.13.0.mod": dial tcp 142.250.74.81:443: connect: network is unreachable

The command that fails is

https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/tree/recipes-networking/cni/cni_git.bb?h=hardknott&id=6c9b889224cedd42191ef5edc7e1f37b0c8ecfec#n37

and can be mitigated by explicitly setting the proxy environment variable on that line:

http_proxy=http://<myproxyserver>:<proxyport> https_proxy=http://<myproxyserver>:<proxyport> ${GO} build

Since building with Gatesgarth (where that line is the same in the recipe, but the cni version 0.7 instead of 0.8) worked fine I did not expect this to happen. Do you guys have any ideas? (Setting the environment variable as describe above does not strike me as the proper/best solution...)

BR,

/Joakim


Re: [PATCH] runc-docker: adjust patch to fit latest version

kai
 

On 6/15/21 10:43 AM, Bruce Ashfield wrote:
On Mon, Jun 14, 2021 at 9:51 PM Kai <kai.kang@...> wrote:
On 3/17/21 8:59 PM, Bruce Ashfield wrote:

On Wed, Mar 17, 2021 at 1:41 AM Chen Qi <Qi.Chen@...> wrote:

Adjust patch to fit the latest version.

This is the wrong fix (and the commit log is wrong).

I unified runc-docker and runc-opencontainers upstream repositories a
while ago, since there are no longer docker specifics in a runc
variant.

I will delete the runc-docker recipe soon, but have been waiting on
that a bit longer.

When I bumped runc last week, I forgot to bump the second variant as
well. I've now done that, and the patch issues are gone.

Hi Bruce,

It breaks do_patch again. And what is the "second variant" you've mentioned, please?
I just pushed the fix.
It works.



By "second variant", I just mean the runc-docker.

At one point, it was significant, but it is basically identical to the
runc-opencontainers one at this point, with a couple of extra patches.
There's one shared patch, and I tend to forget to update the
runc-docker when I bump runc-opencontainers.
Got it. Thanks a lot.

Regards,
Kai


I'll start the process of dropping runc-docker in the upcoming release.

Bruce

Regards,
Kai

Bruce

Signed-off-by: Chen Qi <Qi.Chen@...>
---
...docker-Makefile-respect-GOBUILDFLAGS.patch | 37 +++++++++++++++++++
recipes-containers/runc/runc-docker_git.bb | 2 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 recipes-containers/runc/runc-docker/0001-runc-docker-Makefile-respect-GOBUILDFLAGS.patch

diff --git a/recipes-containers/runc/runc-docker/0001-runc-docker-Makefile-respect-GOBUILDFLAGS.patch b/recipes-containers/runc/runc-docker/0001-runc-docker-Makefile-respect-GOBUILDFLAGS.patch
new file mode 100644
index 00000000..7ea9109a
--- /dev/null
+++ b/recipes-containers/runc/runc-docker/0001-runc-docker-Makefile-respect-GOBUILDFLAGS.patch
@@ -0,0 +1,37 @@
+From c8ac2963cf17d4ee45b8b6ccbdfd81fe52e7092a Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@...>
+Date: Tue, 16 Mar 2021 22:27:45 -0700
+Subject: [PATCH] Makefile: respect GOBUILDFLAGS for runc and remove recvtty
+ from static
+
+Upstream-Status: Inappropriate [OE Specific]
+
+Signed-off-by: Chen Qi <Qi.Chen@...>
+---
+ Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/import/Makefile b/src/import/Makefile
+index e13d8f1d..409b61dd 100644
+--- a/src/import/Makefile
++++ b/src/import/Makefile
+@@ -23,7 +23,7 @@ ifeq ($(shell $(GO) env GOOS),linux)
+ GO_BUILDMODE := "-buildmode=pie"
+ endif
+ endif
+-GO_BUILD := $(GO) build -trimpath $(MOD_VENDOR) $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
++GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(MOD_VENDOR) $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
+ -ldflags "-X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
+ GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build -trimpath $(MOD_VENDOR) $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \
+ -ldflags "-w -extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
+@@ -40,7 +40,6 @@ recvtty:
+
+ static:
+ $(GO_BUILD_STATIC) -o runc .
+- $(GO_BUILD_STATIC) -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
+
+ release:
+ script/release.sh -r release/$(VERSION) -v $(VERSION)
+--
+2.30.2
+
diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb
index 118bfc1d..9e7043ad 100644
--- a/recipes-containers/runc/runc-docker_git.bb
+++ b/recipes-containers/runc/runc-docker_git.bb
@@ -5,7 +5,7 @@ include runc.inc
SRCREV_runc-docker = "b4cb54c2ea78b90f9d8284316aeaeff876f61dfc"
SRC_URI = "git://github.com/opencontainers/runc;nobranch=1;name=runc-docker \
file://0001-runc-Add-console-socket-dev-null.patch \
- file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
+ file://0001-runc-docker-Makefile-respect-GOBUILDFLAGS.patch \
file://0001-runc-docker-SIGUSR1-daemonize.patch \
"

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




--
Kai Kang
Wind River Linux
--
Kai Kang
Wind River Linux


Re: Networking issue with l3s when using systemd

Bruce Ashfield
 

On Mon, Jun 14, 2021 at 4:33 PM Richard Purdie
<richard.purdie@...> wrote:

On Mon, 2021-06-14 at 13:59 -0400, Bruce Ashfield wrote:
On Mon, Jun 14, 2021 at 10:59 AM Matt Spencer <Matt.Spencer@...> wrote:

Hey Bruce,

I understand that changing things can be difficult once launched.

But looking at the systemd documentation here https://wiki.archlinux.org/title/systemd-networkd and in the note that says 'Devices can also be matched by their type. E.g. Type=ether for Ethernet, Type=wlan for Wi-Fi and Type=wwan for WWAN. Note that Type=ether will also match virtual Ethernet interfaces (veth*), which may be undesirable.'

I have created a patch that modifies poky's meta/recipes-core/systemd/systemd-conf/wired.network to add '+Name=!veth*' to the Match clause which the team at Arm are reviewing with a view to upstream.

I feel that this should have been the default behaviour anyway?
Perhaps, but it is probably a good idea to have the default as broad
as possible. If someone comes up with an alternate requirement, you'd
end up having a harder time keeping them both working in oe-core.

We could also carry a bbappend in meta-virtualization that triggers
when "virtualization" is in the distro features. That way we are
providing an override that makes sense within the context of the layer
that is providing it, and the distro features that are enabled.
FWIW I suspect the veth change should be ok for OE-Core if I understand
things correctly.
I'm sure we'll hear if someone is expecting networkd to manage their
veth devices :D

Either way works for me, I just lean towards keeping core very general
and not tailored to any particular use case.

If you are doing virtualization, and in particular kubernetes based,
you need to have a close look at your networking regardless.

Cheers,

Bruce


Cheers,

Richard

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

821 - 840 of 7394