Re: [meta-virtualization] [RFC][PATCH 2/3] cni: use GO_SRCURI_DESTSUFFIX
On Fri, May 24, 2024 at 9:32 PM Bruce Ashfield wrote: > > Interesting. > > I've been through the layer now and have done all the simple semantic > changes to adjust things. > > I'm almost to runtime testing, but expect that by Monday I'll have > everything sorted. OK, looking forward to the master-next update (and kirkstone update) to have a bit greener world builds again :). > > Bruce > > On Fri, May 24, 2024 at 3:26 PM Martin Jansa wrote: > > > > It was failing yesterday, but today it built OK, I didn't do any > > runtime testing (only checked buildhistory-diff). > > > > Have similar change for nerdctl cri-tools, only yq and docker-moby are > > still failing for me. > > > > On Fri, May 24, 2024 at 9:22 PM Bruce Ashfield > > wrote: > > > > > > Did you get this to build with just that change ? > > > > > > My patches to cni are significantly larger to get it to build and > > > create binaries. > > > > > > Bruce > > > > > > On Fri, May 24, 2024 at 3:09 PM Martin Jansa via > > > lists.yoctoproject.org > > > wrote: > > > > > > > > * see: > > > > > > > > https://lists.openembedded.org/g/openembedded-architecture/message/2007 > > > > > > > > https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 > > > > > > > > * fixes: > > > > http://errors.yoctoproject.org/Errors/Details/772691/ > > > > ERROR: QA Issue: cni: LIC_FILES_CHKSUM points to an invalid file: > > > > TOPDIR/tmp-glibc/work/core2-64-oe-linux/cni/v1.2.0-rc0+gitb62753aa2bfa365c1ceaff6f25774a8047c896b5/cni-v1.2.0-rc0+gitb62753aa2bfa365c1ceaff6f25774a8047c896b5/src/import/LICENSE > > > > [license-checksum] > > > > > > > > Signed-off-by: Martin Jansa > > > > --- > > > > recipes-networking/cni/cni_git.bb | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/recipes-networking/cni/cni_git.bb > > > > b/recipes-networking/cni/cni_git.bb > > > > index b41b47cf..c0f316ec 100644 > > > > --- a/recipes-networking/cni/cni_git.bb > > > > +++ b/recipes-networking/cni/cni_git.bb > > > > @@ -14,7 +14,7 @@ SRCREV_plugins = > > > > "b6a0e0bc96906f0d3bd6bfcaab0b5ae72292f46c" > > > > SRCREV_flannel_plugin = "6464faacf5c00e25321573225d74638455ef03a0" > > > > SRCREV_FORMAT = "cni_plugins" > > > > SRC_URI = "\ > > > > - > > > > git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https > > > > \ > > > > + > > > > git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} > > > > \ > > > > > > > > git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https > > > > \ > > > > > > > > git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protocol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel > > > > \ > > > > file://modules.txt \ > > > > -- > > > > 2.45.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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8765): https://lists.yoctoproject.org/g/meta-virtualization/message/8765 Mute This Topic: https://lists.yoctoproject.org/mt/106287452/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-virtualization] [RFC][PATCH 2/3] cni: use GO_SRCURI_DESTSUFFIX
Interesting. I've been through the layer now and have done all the simple semantic changes to adjust things. I'm almost to runtime testing, but expect that by Monday I'll have everything sorted. Bruce On Fri, May 24, 2024 at 3:26 PM Martin Jansa wrote: > > It was failing yesterday, but today it built OK, I didn't do any > runtime testing (only checked buildhistory-diff). > > Have similar change for nerdctl cri-tools, only yq and docker-moby are > still failing for me. > > On Fri, May 24, 2024 at 9:22 PM Bruce Ashfield > wrote: > > > > Did you get this to build with just that change ? > > > > My patches to cni are significantly larger to get it to build and > > create binaries. > > > > Bruce > > > > On Fri, May 24, 2024 at 3:09 PM Martin Jansa via > > lists.yoctoproject.org > > wrote: > > > > > > * see: > > > https://lists.openembedded.org/g/openembedded-architecture/message/2007 > > > > > > https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 > > > > > > * fixes: > > > http://errors.yoctoproject.org/Errors/Details/772691/ > > > ERROR: QA Issue: cni: LIC_FILES_CHKSUM points to an invalid file: > > > TOPDIR/tmp-glibc/work/core2-64-oe-linux/cni/v1.2.0-rc0+gitb62753aa2bfa365c1ceaff6f25774a8047c896b5/cni-v1.2.0-rc0+gitb62753aa2bfa365c1ceaff6f25774a8047c896b5/src/import/LICENSE > > > [license-checksum] > > > > > > Signed-off-by: Martin Jansa > > > --- > > > recipes-networking/cni/cni_git.bb | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/recipes-networking/cni/cni_git.bb > > > b/recipes-networking/cni/cni_git.bb > > > index b41b47cf..c0f316ec 100644 > > > --- a/recipes-networking/cni/cni_git.bb > > > +++ b/recipes-networking/cni/cni_git.bb > > > @@ -14,7 +14,7 @@ SRCREV_plugins = > > > "b6a0e0bc96906f0d3bd6bfcaab0b5ae72292f46c" > > > SRCREV_flannel_plugin = "6464faacf5c00e25321573225d74638455ef03a0" > > > SRCREV_FORMAT = "cni_plugins" > > > SRC_URI = "\ > > > - > > > git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https > > > \ > > > + > > > git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} > > > \ > > > > > > git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https > > > \ > > > > > > git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protocol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel > > > \ > > > file://modules.txt \ > > > -- > > > 2.45.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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8764): https://lists.yoctoproject.org/g/meta-virtualization/message/8764 Mute This Topic: https://lists.yoctoproject.org/mt/106287452/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-virtualization] [RFC][PATCH 2/2] cri-tools: use GO_SRCURI_DESTSUFFIX
* see: https://lists.openembedded.org/g/openembedded-architecture/message/2007 https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 * fixes: http://errors.yoctoproject.org/Errors/Details/772685/ Signed-off-by: Martin Jansa --- ...d-allow-environmental-CGO-settings-and-pass-dont.patch | 6 +++--- recipes-containers/cri-tools/cri-tools_git.bb | 8 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch index 29e0367b..5b25c7c8 100644 --- a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch +++ b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch @@ -35,10 +35,10 @@ Signed-off-by: Bruce Ashfield src/import/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/Makefile +Index: Makefile === cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351.orig/src/import/Makefile -+++ cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/Makefile +--- a/Makefile b/Makefile @@ -74,7 +74,8 @@ @$(MAKE) -B $(CRICTL) diff --git a/recipes-containers/cri-tools/cri-tools_git.bb b/recipes-containers/cri-tools/cri-tools_git.bb index e0caf740..bfaacdd0 100644 --- a/recipes-containers/cri-tools/cri-tools_git.bb +++ b/recipes-containers/cri-tools/cri-tools_git.bb @@ -18,12 +18,12 @@ What is not in scope for this project? \ SRCREV_cri-tools = "17b4dd65d660fec94d7a5a070e3e89ef640f1087" SRC_URI = "\ - git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https \ -file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \ - " + git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ + file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch;patchdir=src/${GO_IMPORT}/ \ +" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" GO_IMPORT = "import" -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8763): https://lists.yoctoproject.org/g/meta-virtualization/message/8763 Mute This Topic: https://lists.yoctoproject.org/mt/106287817/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-virtualization] [RFC][PATCH 1/2] neard: use GO_SRCURI_DESTSUFFIX
* see: https://lists.openembedded.org/g/openembedded-architecture/message/2007 https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 * fixes: http://errors.yoctoproject.org/Errors/Details/772687/ Signed-off-by: Martin Jansa --- ...w-external-specification-of-build-setti.patch | 16 recipes-containers/nerdctl/nerdctl_git.bb| 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch b/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch index ca7b3042..62338d0f 100644 --- a/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch +++ b/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch @@ -1,4 +1,4 @@ -From 0e6809ea075acd3edf7de197cd4e190ccdad6361 Mon Sep 17 00:00:00 2001 +From c624d3aab602242df017f6d4c065ff709e712bab Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 29 Mar 2021 20:50:47 -0400 Subject: [PATCH] Makefile: allow external specification of build settings @@ -7,14 +7,14 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Bruce Ashfield --- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: nerdctl-v2.0.0-beta.1/src/import/Makefile -=== nerdctl-v2.0.0-beta.1.orig/src/import/Makefile -+++ nerdctl-v2.0.0-beta.1/src/import/Makefile -@@ -38,7 +38,7 @@ +diff --git a/Makefile b/Makefile +index 844ae721..f5b90d84 100644 +--- a/Makefile b/Makefile +@@ -38,7 +38,7 @@ REVISION ?= $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --qui GO_BUILD_LDFLAGS ?= -s -w GO_BUILD_FLAGS ?= diff --git a/recipes-containers/nerdctl/nerdctl_git.bb b/recipes-containers/nerdctl/nerdctl_git.bb index 8868274f..9343309c 100644 --- a/recipes-containers/nerdctl/nerdctl_git.bb +++ b/recipes-containers/nerdctl/nerdctl_git.bb @@ -13,12 +13,12 @@ DEPENDS = " \ SRCREV_FORMAT="nerdcli_cgroups" SRCREV_nerdcli = "265d6b9cf526ce7d9ed8d34a0e3c3066901cc463" -SRC_URI = "git://github.com/containerd/nerdctl.git;name=nerdcli;branch=main;protocol=https" +SRC_URI = "git://github.com/containerd/nerdctl.git;name=nerdcli;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" include src_uri.inc # patches and config -SRC_URI += "file://0001-Makefile-allow-external-specification-of-build-setti.patch \ +SRC_URI += "file://0001-Makefile-allow-external-specification-of-build-setti.patch;patchdir=src/${GO_IMPORT} \ file://modules.txt \ " -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8762): https://lists.yoctoproject.org/g/meta-virtualization/message/8762 Mute This Topic: https://lists.yoctoproject.org/mt/106287814/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-virtualization] [RFC][PATCH 2/3] cni: use GO_SRCURI_DESTSUFFIX
It was failing yesterday, but today it built OK, I didn't do any runtime testing (only checked buildhistory-diff). Have similar change for nerdctl cri-tools, only yq and docker-moby are still failing for me. On Fri, May 24, 2024 at 9:22 PM Bruce Ashfield wrote: > > Did you get this to build with just that change ? > > My patches to cni are significantly larger to get it to build and > create binaries. > > Bruce > > On Fri, May 24, 2024 at 3:09 PM Martin Jansa via > lists.yoctoproject.org > wrote: > > > > * see: > > https://lists.openembedded.org/g/openembedded-architecture/message/2007 > > > > https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 > > > > * fixes: > > http://errors.yoctoproject.org/Errors/Details/772691/ > > ERROR: QA Issue: cni: LIC_FILES_CHKSUM points to an invalid file: > > TOPDIR/tmp-glibc/work/core2-64-oe-linux/cni/v1.2.0-rc0+gitb62753aa2bfa365c1ceaff6f25774a8047c896b5/cni-v1.2.0-rc0+gitb62753aa2bfa365c1ceaff6f25774a8047c896b5/src/import/LICENSE > > [license-checksum] > > > > Signed-off-by: Martin Jansa > > --- > > recipes-networking/cni/cni_git.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/recipes-networking/cni/cni_git.bb > > b/recipes-networking/cni/cni_git.bb > > index b41b47cf..c0f316ec 100644 > > --- a/recipes-networking/cni/cni_git.bb > > +++ b/recipes-networking/cni/cni_git.bb > > @@ -14,7 +14,7 @@ SRCREV_plugins = > > "b6a0e0bc96906f0d3bd6bfcaab0b5ae72292f46c" > > SRCREV_flannel_plugin = "6464faacf5c00e25321573225d74638455ef03a0" > > SRCREV_FORMAT = "cni_plugins" > > SRC_URI = "\ > > - > > git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https > > \ > > + > > git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} > > \ > > > > git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https > > \ > > > > git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protocol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel > > \ > > file://modules.txt \ > > -- > > 2.45.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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8761): https://lists.yoctoproject.org/g/meta-virtualization/message/8761 Mute This Topic: https://lists.yoctoproject.org/mt/106287452/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-virtualization] [RFC][PATCH 3/3] go-md2man: use GO_SRCURI_DESTSUFFIX
I've already got this one fixed locally, similar to the other ones, I'll push to master-next once I test the image. Bruce On Fri, May 24, 2024 at 3:09 PM Martin Jansa via lists.yoctoproject.org wrote: > > * see: > https://lists.openembedded.org/g/openembedded-architecture/message/2007 > > https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 > > * fixes: > http://errors.yoctoproject.org/Errors/Details/772683/ > no Go files in > TOPDIR/tmp-glibc/work/core2-64-oe-linux/go-md2man/1.0.10+git/build > > http://errors.yoctoproject.org/Errors/Details/772689/ > ERROR: QA Issue: go-md2man: LIC_FILES_CHKSUM points to an invalid file: > TOPDIR/tmp-glibc/work/core2-64-oe-linux/go-md2man/1.0.10+git/git/src/github.com/cpuguy83/go-md2man/LICENSE.md > [license-checksum] > > Signed-off-by: Martin Jansa > --- > recipes-devtools/go/go-md2man_git.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/recipes-devtools/go/go-md2man_git.bb > b/recipes-devtools/go/go-md2man_git.bb > index 1d96bb1b..73d8d167 100644 > --- a/recipes-devtools/go/go-md2man_git.bb > +++ b/recipes-devtools/go/go-md2man_git.bb > @@ -9,7 +9,7 @@ BBCLASSEXTEND = "native" > GO_IMPORT = "github.com/cpuguy83/go-md2man" > #GO_INSTALL = "${GO_IMPORT}/bin/go-md2man" > > -SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https" > +SRC_URI = > "git://${GO_IMPORT}.git;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" > > SRCREV = "f79a8a8ca69da163eee19ab442bedad7a35bba5a" > PV = "1.0.10+git" > -- > 2.45.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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8760): https://lists.yoctoproject.org/g/meta-virtualization/message/8760 Mute This Topic: https://lists.yoctoproject.org/mt/106287453/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-virtualization] [RFC][PATCH 2/3] cni: use GO_SRCURI_DESTSUFFIX
Did you get this to build with just that change ? My patches to cni are significantly larger to get it to build and create binaries. Bruce On Fri, May 24, 2024 at 3:09 PM Martin Jansa via lists.yoctoproject.org wrote: > > * see: > https://lists.openembedded.org/g/openembedded-architecture/message/2007 > > https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 > > * fixes: > http://errors.yoctoproject.org/Errors/Details/772691/ > ERROR: QA Issue: cni: LIC_FILES_CHKSUM points to an invalid file: > TOPDIR/tmp-glibc/work/core2-64-oe-linux/cni/v1.2.0-rc0+gitb62753aa2bfa365c1ceaff6f25774a8047c896b5/cni-v1.2.0-rc0+gitb62753aa2bfa365c1ceaff6f25774a8047c896b5/src/import/LICENSE > [license-checksum] > > Signed-off-by: Martin Jansa > --- > recipes-networking/cni/cni_git.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/recipes-networking/cni/cni_git.bb > b/recipes-networking/cni/cni_git.bb > index b41b47cf..c0f316ec 100644 > --- a/recipes-networking/cni/cni_git.bb > +++ b/recipes-networking/cni/cni_git.bb > @@ -14,7 +14,7 @@ SRCREV_plugins = "b6a0e0bc96906f0d3bd6bfcaab0b5ae72292f46c" > SRCREV_flannel_plugin = "6464faacf5c00e25321573225d74638455ef03a0" > SRCREV_FORMAT = "cni_plugins" > SRC_URI = "\ > - > git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https > \ > + > git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} > \ > > git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https > \ > > git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protocol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel > \ > file://modules.txt \ > -- > 2.45.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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8759): https://lists.yoctoproject.org/g/meta-virtualization/message/8759 Mute This Topic: https://lists.yoctoproject.org/mt/106287452/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-virtualization] [RFC][PATCH 1/3] netns: use GO_SRCURI_DESTSUFFIX
Thanks! I've already fixed this one locally, will push everything once my image testing is done Bruce On Fri, May 24, 2024 at 3:09 PM Martin Jansa via lists.yoctoproject.org wrote: > > * see: > https://lists.openembedded.org/g/openembedded-architecture/message/2007 > > https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 > > * fixes: > http://errors.yoctoproject.org/Errors/Details/772686/ > > Signed-off-by: Martin Jansa > --- > recipes-networking/netns/netns_git.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/recipes-networking/netns/netns_git.bb > b/recipes-networking/netns/netns_git.bb > index 357275c1..be41d2b8 100644 > --- a/recipes-networking/netns/netns_git.bb > +++ b/recipes-networking/netns/netns_git.bb > @@ -3,7 +3,7 @@ SUMMARY = "Runc hook for setting up default bridge > networking." > LICENSE = "MIT" > LIC_FILES_CHKSUM = > "file://src/import/LICENSE;md5=7bac31faf84a2d7e88972f562a3ebbe5" > > -SRC_URI = "git://github.com/genuinetools/netns;branch=master;protocol=https \ > +SRC_URI = > "git://github.com/genuinetools/netns;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} > \ > file://Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch \ >" > SRCREV = "00d5d07ab1c8afcf481ffa5958719943b6ecfde4" > -- > 2.45.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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8758): https://lists.yoctoproject.org/g/meta-virtualization/message/8758 Mute This Topic: https://lists.yoctoproject.org/mt/106287450/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-virtualization] [RFC][PATCH 3/3] go-md2man: use GO_SRCURI_DESTSUFFIX
* see: https://lists.openembedded.org/g/openembedded-architecture/message/2007 https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 * fixes: http://errors.yoctoproject.org/Errors/Details/772683/ no Go files in TOPDIR/tmp-glibc/work/core2-64-oe-linux/go-md2man/1.0.10+git/build http://errors.yoctoproject.org/Errors/Details/772689/ ERROR: QA Issue: go-md2man: LIC_FILES_CHKSUM points to an invalid file: TOPDIR/tmp-glibc/work/core2-64-oe-linux/go-md2man/1.0.10+git/git/src/github.com/cpuguy83/go-md2man/LICENSE.md [license-checksum] Signed-off-by: Martin Jansa --- recipes-devtools/go/go-md2man_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-devtools/go/go-md2man_git.bb b/recipes-devtools/go/go-md2man_git.bb index 1d96bb1b..73d8d167 100644 --- a/recipes-devtools/go/go-md2man_git.bb +++ b/recipes-devtools/go/go-md2man_git.bb @@ -9,7 +9,7 @@ BBCLASSEXTEND = "native" GO_IMPORT = "github.com/cpuguy83/go-md2man" #GO_INSTALL = "${GO_IMPORT}/bin/go-md2man" -SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https" +SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" SRCREV = "f79a8a8ca69da163eee19ab442bedad7a35bba5a" PV = "1.0.10+git" -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8757): https://lists.yoctoproject.org/g/meta-virtualization/message/8757 Mute This Topic: https://lists.yoctoproject.org/mt/106287453/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-virtualization] [RFC][PATCH 2/3] cni: use GO_SRCURI_DESTSUFFIX
* see: https://lists.openembedded.org/g/openembedded-architecture/message/2007 https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 * fixes: http://errors.yoctoproject.org/Errors/Details/772691/ ERROR: QA Issue: cni: LIC_FILES_CHKSUM points to an invalid file: TOPDIR/tmp-glibc/work/core2-64-oe-linux/cni/v1.2.0-rc0+gitb62753aa2bfa365c1ceaff6f25774a8047c896b5/cni-v1.2.0-rc0+gitb62753aa2bfa365c1ceaff6f25774a8047c896b5/src/import/LICENSE [license-checksum] Signed-off-by: Martin Jansa --- recipes-networking/cni/cni_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index b41b47cf..c0f316ec 100644 --- a/recipes-networking/cni/cni_git.bb +++ b/recipes-networking/cni/cni_git.bb @@ -14,7 +14,7 @@ SRCREV_plugins = "b6a0e0bc96906f0d3bd6bfcaab0b5ae72292f46c" SRCREV_flannel_plugin = "6464faacf5c00e25321573225d74638455ef03a0" SRCREV_FORMAT = "cni_plugins" SRC_URI = "\ - git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https \ + git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https \ git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protocol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel \ file://modules.txt \ -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8756): https://lists.yoctoproject.org/g/meta-virtualization/message/8756 Mute This Topic: https://lists.yoctoproject.org/mt/106287452/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-virtualization] [RFC][PATCH 1/3] netns: use GO_SRCURI_DESTSUFFIX
* see: https://lists.openembedded.org/g/openembedded-architecture/message/2007 https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 * fixes: http://errors.yoctoproject.org/Errors/Details/772686/ Signed-off-by: Martin Jansa --- recipes-networking/netns/netns_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-networking/netns/netns_git.bb b/recipes-networking/netns/netns_git.bb index 357275c1..be41d2b8 100644 --- a/recipes-networking/netns/netns_git.bb +++ b/recipes-networking/netns/netns_git.bb @@ -3,7 +3,7 @@ SUMMARY = "Runc hook for setting up default bridge networking." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=7bac31faf84a2d7e88972f562a3ebbe5" -SRC_URI = "git://github.com/genuinetools/netns;branch=master;protocol=https \ +SRC_URI = "git://github.com/genuinetools/netns;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ file://Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch \ " SRCREV = "00d5d07ab1c8afcf481ffa5958719943b6ecfde4" -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8755): https://lists.yoctoproject.org/g/meta-virtualization/message/8755 Mute This Topic: https://lists.yoctoproject.org/mt/106287450/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-virtualization] [RFC][PATCH 1/4] dev86: ignore various issues fatal with gcc-14
Looks good to me. I'll get this queued once I've worked through the golang issues. Bruce On Fri, May 24, 2024 at 2:28 AM Martin Jansa via lists.yoctoproject.org wrote: > > work arounds for: > meta-virtualization/recipes-extended/dev86/dev86_git.bb:do_install > > http://errors.yoctoproject.org/Errors/Build/183127/ > > Signed-off-by: Martin Jansa > --- > recipes-extended/dev86/dev86_git.bb | 17 + > 1 file changed, 17 insertions(+) > > diff --git a/recipes-extended/dev86/dev86_git.bb > b/recipes-extended/dev86/dev86_git.bb > index a3d0fded..5adf2826 100644 > --- a/recipes-extended/dev86/dev86_git.bb > +++ b/recipes-extended/dev86/dev86_git.bb > @@ -41,3 +41,20 @@ do_install() { > } > > FILES:${PN} += "${libdir}/bcc" > + > +# http://gecko.lge.com:8000/Errors/Details/832862 > +# http://errors.yoctoproject.org/Errors/Details/766930/ > +# cpp.c:548:1: error: type of 'ch' defaults to 'int' [-Wimplicit-int] > +# strsave.c:47:42: error: implicit declaration of function 'strcmp' > [-Wimplicit-function-declaration] > +# strsave.c:55:26: error: implicit declaration of function 'hash' > [-Wimplicit-function-declaration] > +# strsave.c:66:32: error: implicit declaration of function 'strlen' > [-Wimplicit-function-declaration] > +# symbol.c:60:42: error: implicit declaration of function 'strcmp' > [-Wimplicit-function-declaration] > +# symbol.c:72:30: error: implicit declaration of function 'strlen' > [-Wimplicit-function-declaration] > +# symbol.c:77:13: error: implicit declaration of function 'hash' > [-Wimplicit-function-declaration] > +# tok_class.c:305:43: error: implicit declaration of function 'strlen' > [-Wimplicit-function-declaration] > +# tok_io.c:219:20: error: implicit declaration of function 'atoi' > [-Wimplicit-function-declaration] > +# tok_io.c:488:20: error: implicit declaration of function 'strlen' > [-Wimplicit-function-declaration] > +# unproto.c:188:51: error: implicit declaration of function 'strcmp' > [-Wimplicit-function-declaration] > +CFLAGS += "-Wno-error=implicit-int -Wno-error=implicit-function-declaration" > + > +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" > -- > 2.45.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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8754): https://lists.yoctoproject.org/g/meta-virtualization/message/8754 Mute This Topic: https://lists.yoctoproject.org/mt/106277144/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-virtualization] [RFC][PATCH 2/4] docker-compose: use GO_SRCURI_DESTSUFFIX
Ack'd. This also makes sense. I'm adjusting my scripts to update all similar recipes to adapt to the oe-core changes. Bruce On Fri, May 24, 2024 at 2:28 AM Martin Jansa via lists.yoctoproject.org wrote: > > * see: > https://lists.openembedded.org/g/openembedded-architecture/message/2007 > > https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 > > * the files are now unpacked in different directory and LIC_FILES_CHKSUM > doesn't match: > Fixes: > ERROR: QA Issue: docker-compose: LIC_FILES_CHKSUM points to an invalid file: > docker-compose/v2.26.0/docker-compose-v2.26.0/src/import/LICENSE > [license-checksum] > > * fixes: > http://errors.yoctoproject.org/Errors/Details/772692/ > ERROR: QA Issue: docker-compose: LIC_FILES_CHKSUM points to an invalid > file: > TOPDIR/tmp-glibc/work/core2-64-oe-linux/docker-compose/v2.26.0/docker-compose-v2.26.0/src/import/LICENSE > [license-checksum] > > Signed-off-by: Martin Jansa > --- > .../docker-compose/docker-compose_git.bb | 2 +- > recipes-containers/docker-compose/src_uri.inc | 372 +- > 2 files changed, 187 insertions(+), 187 deletions(-) > > diff --git a/recipes-containers/docker-compose/docker-compose_git.bb > b/recipes-containers/docker-compose/docker-compose_git.bb > index 07650126..326d23d9 100644 > --- a/recipes-containers/docker-compose/docker-compose_git.bb > +++ b/recipes-containers/docker-compose/docker-compose_git.bb > @@ -11,7 +11,7 @@ DEPENDS = " \ > SRCREV_FORMAT="compose_survey" > SRCREV_compose = "3371227794f5f3645f4f19829c60a741635ed329" > > -SRC_URI = > "git://github.com/docker/compose;name=compose;branch=main;protocol=https" > +SRC_URI = > "git://github.com/docker/compose;name=compose;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" > > include src_uri.inc > > diff --git a/recipes-containers/docker-compose/src_uri.inc > b/recipes-containers/docker-compose/src_uri.inc > index 1978abc7..8327cb0e 100644 > --- a/recipes-containers/docker-compose/src_uri.inc > +++ b/recipes-containers/docker-compose/src_uri.inc > @@ -1,930 +1,930 @@ > # k8s.io/api v0.29.2 > # [1] git ls-remote https://github.com/kubernetes/api > d47313059888ec984bf8432ed155fae5be935c31 > SRCREV_k8s.io-api="d47313059888ec984bf8432ed155fae5be935c31" > -SRC_URI += > "git://github.com/kubernetes/api;name=k8s.io-api;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/k8s.io/api" > +SRC_URI += > "git://github.com/kubernetes/api;name=k8s.io-api;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/k8s.io/api" > > # k8s.io/utils v0.0.0-20230726121419-3b25d923346b > # [1] git ls-remote https://github.com/kubernetes/utils > 3b25d923346b3814e0898684c97390092f31a61e > SRCREV_utils="3b25d923346b3814e0898684c97390092f31a61e" > -SRC_URI += > "git://github.com/kubernetes/utils;name=utils;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/k8s.io/utils" > +SRC_URI += > "git://github.com/kubernetes/utils;name=utils;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/k8s.io/utils" > > # k8s.io/klog/v2 v2.110.1 > # [1] git ls-remote https://github.com/kubernetes/klog > e3f75b8af2707d64b5dd4c440ae8384ed2f2c386 > SRCREV_klog-v2="e3f75b8af2707d64b5dd4c440ae8384ed2f2c386" > -SRC_URI += > "git://github.com/kubernetes/klog;name=klog-v2;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/k8s.io/klog/v2" > +SRC_URI += > "git://github.com/kubernetes/klog;name=klog-v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/k8s.io/klog/v2" > > # gotest.tools/v3 v3.5.1 > # [1] git ls-remote https://github.com/gotestyourself/gotest.tools > 81cea1abc596b025bf2573c7fdf97740512e4c6c > SRCREV_v3="81cea1abc596b025bf2573c7fdf97740512e4c6c" > -SRC_URI += > "git://github.com/gotestyourself/gotest.tools;name=v3;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gotest.tools/v3" > +SRC_URI += > "git://github.com/gotestyourself/gotest.tools;name=v3;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/gotest.tools/v3" > > # dario.cat/mergo v1.0.0 > # [1] git ls-remote https://github.com/imdario/mergo > 131de815afc35a77c41ae99da6c8f4288b6cb513 > SRCREV_mergo="131de815afc35a77c41ae99da6c8f4288b6cb513" > -SRC_URI += > "git://github.com/imdario/mergo;name=mergo;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/dario.cat/mergo" > +SRC_URI += > "git://github.com/imdario/mergo;name=mergo;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/dario.cat/mergo" > > # gopkg.in/inf.v0 v0.9.1 > # [1] git ls-remote https://github.com/go-inf/inf > d2d2541c53f18d2a059457998ce2876cc8e67cbf > SRCREV_inf.v0="d2d2541c53f18d2a059457998ce2876cc8e67cbf" > -SRC_URI += >
Re: [meta-virtualization] [RFC][PATCH 4/4] linux-yocto_virtualization.inc: adjust path to kcfg for UNPACKDIR
Ack'd. This one is good. I did the same thing locally to adjust to the new directory structure, but your commit log is better, so I'll take this version. Bruce On Fri, May 24, 2024 at 2:28 AM Martin Jansa via lists.yoctoproject.org wrote: > > * UNPACKDIR added one more level > > * this needs some more robust solution, but now with UNPACKDIR changes > this was failing in do_kernel_metadata: > > | NOTE: do_kernel_metadata: for summary/debug, set KCONF_AUDIT_LEVEL > 0 > | ERROR: Feature '../recipe-sysroot-native/kcfg/cfg/virtio.scc' not found, > this will cause configuration failures. > | ERROR: Check the SRC_URI for meta-data repositories or directories that may > be missing > | ERROR: Set KERNEL_DANGLING_FEATURES_WARN_ONLY to ignore this issue > > * fixes: > http://errors.yoctoproject.org/Errors/Details/772680/ > > Signed-off-by: Martin Jansa > --- > recipes-kernel/linux/linux-yocto_virtualization.inc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/recipes-kernel/linux/linux-yocto_virtualization.inc > b/recipes-kernel/linux/linux-yocto_virtualization.inc > index 9a6554d1..5edaef94 100644 > --- a/recipes-kernel/linux/linux-yocto_virtualization.inc > +++ b/recipes-kernel/linux/linux-yocto_virtualization.inc > @@ -21,12 +21,12 @@ def kernel_cache_cond_feature(src_uri,feature): > if kernel_cache: > return feature > > -return "../recipe-sysroot-native/kcfg/" + feature > +return "../../recipe-sysroot-native/kcfg/" + feature > > # no conditional, just use the yocto-kernel-cache addition, yes > # the src_uri isn't used, but we may need to check it in the future > def kernel_cache_feature(src_uri,feature): > -return "../recipe-sysroot-native/kcfg/" + feature > +return "../../recipe-sysroot-native/kcfg/" + feature > > def distro_cond_feature(feature_fragment,distro_feature,d): > import bb > -- > 2.45.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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8752): https://lists.yoctoproject.org/g/meta-virtualization/message/8752 Mute This Topic: https://lists.yoctoproject.org/mt/106277147/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-virtualization] [RFC][PATCH 3/4] runc: use GO_SRCURI_DESTSUFFIX
On Fri, May 24, 2024 at 2:28 AM Martin Jansa via lists.yoctoproject.org wrote: > > * see: > https://lists.openembedded.org/g/openembedded-architecture/message/2007 > and > > https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 > > * the files are now unpacked in different directory and paths in patches > no longer match. > > * WIP started by me and finished by Theodore, thank you! > > * fixes: > http://errors.yoctoproject.org/Errors/Details/772681/ > > Signed-off-by: Theodore A. Roth > Signed-off-by: Martin Jansa > --- > ...spect-GOBUILDFLAGS-for-runc-and-remove-re.patch | 6 +++--- > .../0001-runc-Add-console-socket-dev-null.patch| 4 ++-- > .../0001-runc-docker-SIGUSR1-daemonize.patch | 8 > recipes-containers/runc/runc-docker_git.bb | 8 > recipes-containers/runc/runc-opencontainers_git.bb | 4 ++-- > recipes-containers/runc/runc.inc | 14 +++--- > 6 files changed, 22 insertions(+), 22 deletions(-) > > diff --git > a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch > > b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch > index 9e5a8313..30332114 100644 > --- > a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch > +++ > b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch > @@ -13,10 +13,10 @@ Signed-off-by: Bruce Ashfield > Makefile | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > -Index: git/src/import/Makefile > +Index: Makefile > === > git.orig/src/import/Makefile > -+++ git/src/import/Makefile > +--- a/Makefile > b/Makefile > @@ -24,7 +24,7 @@ > GO_BUILDMODE := "-buildmode=pie" > endif > diff --git > a/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch > > b/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch > index cb0ddc37..91d56e7b 100644 > --- > a/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch > +++ > b/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch > @@ -16,8 +16,8 @@ Signed-off-by: Jason Wessel > > Index: git/src/import/utils_linux.go > === > git.orig/src/import/utils_linux.go > -+++ git/src/import/utils_linux.go > +--- a/utils_linux.go > b/utils_linux.go > @@ -267,6 +267,11 @@ > } > > diff --git > a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch > > b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch > index d3d1134b..bcf0cb27 100644 > --- > a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch > +++ > b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch > @@ -33,8 +33,8 @@ Signed-off-by: Jason Wessel > > Index: git/src/import/signals.go > === > git.orig/src/import/signals.go > -+++ git/src/import/signals.go > +--- a/signals.go > b/signals.go > @@ -5,7 +5,9 @@ > import ( > "os" > @@ -120,8 +120,8 @@ Index: git/src/import/signals.go > _ = tty.resize() > Index: git/src/import/utils_linux.go > === > git.orig/src/import/utils_linux.go > -+++ git/src/import/utils_linux.go > +--- a/utils_linux.go > b/utils_linux.go > @@ -345,7 +345,7 @@ > if err != nil { > r.terminate(process) > diff --git a/recipes-containers/runc/runc-docker_git.bb > b/recipes-containers/runc/runc-docker_git.bb > index 8d078e85..21291c7e 100644 > --- a/recipes-containers/runc/runc-docker_git.bb > +++ b/recipes-containers/runc/runc-docker_git.bb > @@ -3,10 +3,10 @@ include runc.inc > # Note: this rev is before the required protocol field, update when all > components > # have been updated to match. > SRCREV_runc-docker = "a9833ff391a71b30069a6c3f816db113379a4346" > -SRC_URI = > "git://github.com/opencontainers/runc;branch=release-1.1;name=runc-docker;protocol=https > \ > - file://0001-runc-Add-console-socket-dev-null.patch \ > - > file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ > - file://0001-runc-docker-SIGUSR1-daemonize.patch \ > +SRC_URI = > "git://github.com/opencontainers/runc;branch=release-1.1;name=runc-docker;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} > \ > + > file://0001-runc-Add-console-socket-dev-null.patch;patchdir=${GO_SRCURI_DESTSUFFIX} > \ > + > file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch;patchdir=${GO_SRCURI_DESTSUFFIX} > \ > + >
[meta-virtualization][scarthgap][PATCH 1/1] buildah: upgrade to 1.34.3
From: Yogita Urade Includes fix for: CVE-2024-1753 Changelog: = 2db756331 (tag: v1.34.3) [release-1.34] Bump Buildah to v1.34.3 699d1ed51 [release-1.34] CVE-2024-24786 protobuf to 1.33 4ffe07267 Merge pull request #5419 from TomSweeneyRedHat/dev/tsweeney/cve-1.34 968e8ab62 [release-1.34] Bump to Buildah v1.34.3-dev 776a1463d (tag: v1.34.2) [release-1.34] Bump to Buildah v1.34.2 afc086b65 conformance tests: don't break on trailing zeroes in layer blobs 3deda1913 [release-1.34] CVE-2024-1753 container escape fix 14d60c988 Merge pull request #5365 from edsantiago/skip_unshare_on_rhel--1.34 4f775b4a1 tests: skip_if_no_unshare(): check for --setuid dbeb097c6 Merge pull request #5352 from TomSweeneyRedHat/dev/tsweeney/buildah_1_34_1 Signed-off-by: Yogita Urade --- recipes-containers/buildah/buildah_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-containers/buildah/buildah_git.bb b/recipes-containers/buildah/buildah_git.bb index 64ee4f7d..90ffc238 100644 --- a/recipes-containers/buildah/buildah_git.bb +++ b/recipes-containers/buildah/buildah_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/containers/buildah/LICENSE;md5=e3fc50a S = "${WORKDIR}/git" -BUILDAH_VERSION = "1.34.1" +BUILDAH_VERSION = "1.34.3" PV = "${BUILDAH_VERSION}" @@ -28,7 +28,7 @@ GO_WORKDIR = "${GO_INSTALL}" GOBUILDFLAGS += "-mod vendor" SRCREV_FORMAT = "buildah_storage" -SRCREV_buildah = "dbeb097c6fbf4bfd643f096992da572a97a8ec12" +SRCREV_buildah = "2db756331014a4f355507df47d2622d05532da1f" SRCREV_storage = "246ba3062e8b551026aef2708eee747014ce5c52" SRC_URI = " \ -- 2.40.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8750): https://lists.yoctoproject.org/g/meta-virtualization/message/8750 Mute This Topic: https://lists.yoctoproject.org/mt/106278054/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-virtualization] [RFC][PATCH 3/4] runc: use GO_SRCURI_DESTSUFFIX
* see: https://lists.openembedded.org/g/openembedded-architecture/message/2007 and https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 * the files are now unpacked in different directory and paths in patches no longer match. * WIP started by me and finished by Theodore, thank you! * fixes: http://errors.yoctoproject.org/Errors/Details/772681/ Signed-off-by: Theodore A. Roth Signed-off-by: Martin Jansa --- ...spect-GOBUILDFLAGS-for-runc-and-remove-re.patch | 6 +++--- .../0001-runc-Add-console-socket-dev-null.patch| 4 ++-- .../0001-runc-docker-SIGUSR1-daemonize.patch | 8 recipes-containers/runc/runc-docker_git.bb | 8 recipes-containers/runc/runc-opencontainers_git.bb | 4 ++-- recipes-containers/runc/runc.inc | 14 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch index 9e5a8313..30332114 100644 --- a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch +++ b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch @@ -13,10 +13,10 @@ Signed-off-by: Bruce Ashfield Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -Index: git/src/import/Makefile +Index: Makefile === git.orig/src/import/Makefile -+++ git/src/import/Makefile +--- a/Makefile b/Makefile @@ -24,7 +24,7 @@ GO_BUILDMODE := "-buildmode=pie" endif diff --git a/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch b/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch index cb0ddc37..91d56e7b 100644 --- a/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch +++ b/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch @@ -16,8 +16,8 @@ Signed-off-by: Jason Wessel Index: git/src/import/utils_linux.go === git.orig/src/import/utils_linux.go -+++ git/src/import/utils_linux.go +--- a/utils_linux.go b/utils_linux.go @@ -267,6 +267,11 @@ } diff --git a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch index d3d1134b..bcf0cb27 100644 --- a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch +++ b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch @@ -33,8 +33,8 @@ Signed-off-by: Jason Wessel Index: git/src/import/signals.go === git.orig/src/import/signals.go -+++ git/src/import/signals.go +--- a/signals.go b/signals.go @@ -5,7 +5,9 @@ import ( "os" @@ -120,8 +120,8 @@ Index: git/src/import/signals.go _ = tty.resize() Index: git/src/import/utils_linux.go === git.orig/src/import/utils_linux.go -+++ git/src/import/utils_linux.go +--- a/utils_linux.go b/utils_linux.go @@ -345,7 +345,7 @@ if err != nil { r.terminate(process) diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb index 8d078e85..21291c7e 100644 --- a/recipes-containers/runc/runc-docker_git.bb +++ b/recipes-containers/runc/runc-docker_git.bb @@ -3,10 +3,10 @@ include runc.inc # Note: this rev is before the required protocol field, update when all components # have been updated to match. SRCREV_runc-docker = "a9833ff391a71b30069a6c3f816db113379a4346" -SRC_URI = "git://github.com/opencontainers/runc;branch=release-1.1;name=runc-docker;protocol=https \ - file://0001-runc-Add-console-socket-dev-null.patch \ - file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ - file://0001-runc-docker-SIGUSR1-daemonize.patch \ +SRC_URI = "git://github.com/opencontainers/runc;branch=release-1.1;name=runc-docker;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ + file://0001-runc-Add-console-socket-dev-null.patch;patchdir=${GO_SRCURI_DESTSUFFIX} \ + file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch;patchdir=${GO_SRCURI_DESTSUFFIX} \ + file://0001-runc-docker-SIGUSR1-daemonize.patch;patchdir=${GO_SRCURI_DESTSUFFIX} \ " RUNC_VERSION = "1.1.12" diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb index 188b8440..aba59ea1 100644 --- a/recipes-containers/runc/runc-opencontainers_git.bb +++
[meta-virtualization] [RFC][PATCH 4/4] linux-yocto_virtualization.inc: adjust path to kcfg for UNPACKDIR
* UNPACKDIR added one more level * this needs some more robust solution, but now with UNPACKDIR changes this was failing in do_kernel_metadata: | NOTE: do_kernel_metadata: for summary/debug, set KCONF_AUDIT_LEVEL > 0 | ERROR: Feature '../recipe-sysroot-native/kcfg/cfg/virtio.scc' not found, this will cause configuration failures. | ERROR: Check the SRC_URI for meta-data repositories or directories that may be missing | ERROR: Set KERNEL_DANGLING_FEATURES_WARN_ONLY to ignore this issue * fixes: http://errors.yoctoproject.org/Errors/Details/772680/ Signed-off-by: Martin Jansa --- recipes-kernel/linux/linux-yocto_virtualization.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-yocto_virtualization.inc b/recipes-kernel/linux/linux-yocto_virtualization.inc index 9a6554d1..5edaef94 100644 --- a/recipes-kernel/linux/linux-yocto_virtualization.inc +++ b/recipes-kernel/linux/linux-yocto_virtualization.inc @@ -21,12 +21,12 @@ def kernel_cache_cond_feature(src_uri,feature): if kernel_cache: return feature -return "../recipe-sysroot-native/kcfg/" + feature +return "../../recipe-sysroot-native/kcfg/" + feature # no conditional, just use the yocto-kernel-cache addition, yes # the src_uri isn't used, but we may need to check it in the future def kernel_cache_feature(src_uri,feature): -return "../recipe-sysroot-native/kcfg/" + feature +return "../../recipe-sysroot-native/kcfg/" + feature def distro_cond_feature(feature_fragment,distro_feature,d): import bb -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8749): https://lists.yoctoproject.org/g/meta-virtualization/message/8749 Mute This Topic: https://lists.yoctoproject.org/mt/106277147/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-virtualization] [RFC][PATCH 2/4] docker-compose: use GO_SRCURI_DESTSUFFIX
* see: https://lists.openembedded.org/g/openembedded-architecture/message/2007 https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327 * the files are now unpacked in different directory and LIC_FILES_CHKSUM doesn't match: Fixes: ERROR: QA Issue: docker-compose: LIC_FILES_CHKSUM points to an invalid file: docker-compose/v2.26.0/docker-compose-v2.26.0/src/import/LICENSE [license-checksum] * fixes: http://errors.yoctoproject.org/Errors/Details/772692/ ERROR: QA Issue: docker-compose: LIC_FILES_CHKSUM points to an invalid file: TOPDIR/tmp-glibc/work/core2-64-oe-linux/docker-compose/v2.26.0/docker-compose-v2.26.0/src/import/LICENSE [license-checksum] Signed-off-by: Martin Jansa --- .../docker-compose/docker-compose_git.bb | 2 +- recipes-containers/docker-compose/src_uri.inc | 372 +- 2 files changed, 187 insertions(+), 187 deletions(-) diff --git a/recipes-containers/docker-compose/docker-compose_git.bb b/recipes-containers/docker-compose/docker-compose_git.bb index 07650126..326d23d9 100644 --- a/recipes-containers/docker-compose/docker-compose_git.bb +++ b/recipes-containers/docker-compose/docker-compose_git.bb @@ -11,7 +11,7 @@ DEPENDS = " \ SRCREV_FORMAT="compose_survey" SRCREV_compose = "3371227794f5f3645f4f19829c60a741635ed329" -SRC_URI = "git://github.com/docker/compose;name=compose;branch=main;protocol=https" +SRC_URI = "git://github.com/docker/compose;name=compose;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" include src_uri.inc diff --git a/recipes-containers/docker-compose/src_uri.inc b/recipes-containers/docker-compose/src_uri.inc index 1978abc7..8327cb0e 100644 --- a/recipes-containers/docker-compose/src_uri.inc +++ b/recipes-containers/docker-compose/src_uri.inc @@ -1,930 +1,930 @@ # k8s.io/api v0.29.2 # [1] git ls-remote https://github.com/kubernetes/api d47313059888ec984bf8432ed155fae5be935c31 SRCREV_k8s.io-api="d47313059888ec984bf8432ed155fae5be935c31" -SRC_URI += "git://github.com/kubernetes/api;name=k8s.io-api;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/k8s.io/api" +SRC_URI += "git://github.com/kubernetes/api;name=k8s.io-api;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/k8s.io/api" # k8s.io/utils v0.0.0-20230726121419-3b25d923346b # [1] git ls-remote https://github.com/kubernetes/utils 3b25d923346b3814e0898684c97390092f31a61e SRCREV_utils="3b25d923346b3814e0898684c97390092f31a61e" -SRC_URI += "git://github.com/kubernetes/utils;name=utils;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/k8s.io/utils" +SRC_URI += "git://github.com/kubernetes/utils;name=utils;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/k8s.io/utils" # k8s.io/klog/v2 v2.110.1 # [1] git ls-remote https://github.com/kubernetes/klog e3f75b8af2707d64b5dd4c440ae8384ed2f2c386 SRCREV_klog-v2="e3f75b8af2707d64b5dd4c440ae8384ed2f2c386" -SRC_URI += "git://github.com/kubernetes/klog;name=klog-v2;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/k8s.io/klog/v2" +SRC_URI += "git://github.com/kubernetes/klog;name=klog-v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/k8s.io/klog/v2" # gotest.tools/v3 v3.5.1 # [1] git ls-remote https://github.com/gotestyourself/gotest.tools 81cea1abc596b025bf2573c7fdf97740512e4c6c SRCREV_v3="81cea1abc596b025bf2573c7fdf97740512e4c6c" -SRC_URI += "git://github.com/gotestyourself/gotest.tools;name=v3;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gotest.tools/v3" +SRC_URI += "git://github.com/gotestyourself/gotest.tools;name=v3;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/gotest.tools/v3" # dario.cat/mergo v1.0.0 # [1] git ls-remote https://github.com/imdario/mergo 131de815afc35a77c41ae99da6c8f4288b6cb513 SRCREV_mergo="131de815afc35a77c41ae99da6c8f4288b6cb513" -SRC_URI += "git://github.com/imdario/mergo;name=mergo;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/dario.cat/mergo" +SRC_URI += "git://github.com/imdario/mergo;name=mergo;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/dario.cat/mergo" # gopkg.in/inf.v0 v0.9.1 # [1] git ls-remote https://github.com/go-inf/inf d2d2541c53f18d2a059457998ce2876cc8e67cbf SRCREV_inf.v0="d2d2541c53f18d2a059457998ce2876cc8e67cbf" -SRC_URI += "git://github.com/go-inf/inf;name=inf.v0;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/inf.v0" +SRC_URI += "git://github.com/go-inf/inf;name=inf.v0;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/gopkg.in/inf.v0" # go.uber.org/mock v0.4.0 # [1] git ls-remote https://github.com/uber/mock 74a29c6e6c2cbb8ccee94db061c1604ff33fd188
[meta-virtualization] [RFC][PATCH 1/4] dev86: ignore various issues fatal with gcc-14
work arounds for: meta-virtualization/recipes-extended/dev86/dev86_git.bb:do_install http://errors.yoctoproject.org/Errors/Build/183127/ Signed-off-by: Martin Jansa --- recipes-extended/dev86/dev86_git.bb | 17 + 1 file changed, 17 insertions(+) diff --git a/recipes-extended/dev86/dev86_git.bb b/recipes-extended/dev86/dev86_git.bb index a3d0fded..5adf2826 100644 --- a/recipes-extended/dev86/dev86_git.bb +++ b/recipes-extended/dev86/dev86_git.bb @@ -41,3 +41,20 @@ do_install() { } FILES:${PN} += "${libdir}/bcc" + +# http://gecko.lge.com:8000/Errors/Details/832862 +# http://errors.yoctoproject.org/Errors/Details/766930/ +# cpp.c:548:1: error: type of 'ch' defaults to 'int' [-Wimplicit-int] +# strsave.c:47:42: error: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration] +# strsave.c:55:26: error: implicit declaration of function 'hash' [-Wimplicit-function-declaration] +# strsave.c:66:32: error: implicit declaration of function 'strlen' [-Wimplicit-function-declaration] +# symbol.c:60:42: error: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration] +# symbol.c:72:30: error: implicit declaration of function 'strlen' [-Wimplicit-function-declaration] +# symbol.c:77:13: error: implicit declaration of function 'hash' [-Wimplicit-function-declaration] +# tok_class.c:305:43: error: implicit declaration of function 'strlen' [-Wimplicit-function-declaration] +# tok_io.c:219:20: error: implicit declaration of function 'atoi' [-Wimplicit-function-declaration] +# tok_io.c:488:20: error: implicit declaration of function 'strlen' [-Wimplicit-function-declaration] +# unproto.c:188:51: error: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration] +CFLAGS += "-Wno-error=implicit-int -Wno-error=implicit-function-declaration" + +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8746): https://lists.yoctoproject.org/g/meta-virtualization/message/8746 Mute This Topic: https://lists.yoctoproject.org/mt/106277144/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-