Re: [meta-virtualization] [RFC][PATCH 2/3] cni: use GO_SRCURI_DESTSUFFIX
On Wed, May 29, 2024 at 5:34 AM ChenQi wrote:
>
> Hi Bruce,
>
> I did some investigation this afternoon. A patch series has been sent,
> which mostly comes from 'grep + sed', and also includes a patch from Martin.
> I did build tests, the result looks good to me. I think the only
> remaining recipes that need to be dealt with are: yq and possibly runv.
runv has been put into read-only mode, so I'm going to remove it from
the layer and pull in a replacement. So nothing really to do on their front.
Bruce
> I'll need to do something else tomorrow. Hope you or someone else could
> check more.
> Hope this would help a little bit.
>
> Regards,
> Qi
>
> On 5/28/24 04:37, Bruce Ashfield via lists.yoctoproject.org wrote:
> > As an update. My patience is wearing thin.
> >
> > The posted patches don't build for me, my changes don't build for me,
> > if I hack things, the runtime is broken.
> >
> > I'm seeing different fetching and source management based on the
> > number of git repositories in the SCR_URI, which means I'm running
> > into everything from missing source to license checksum failures when
> > I reorganize the code.
> >
> > I'm stubborn about this sort of thing, there's no sense in me just
> > merging patches that don't build on my machines, and/or patches that I
> > don't understand how they fix issues, since I'll never be able to
> > maintain things afterwards.
> >
> > I am still working on this, but I'm no debugging oe-core code to try
> > and understand what is happening and why the behaviour is changing, so
> > everything is extremely hacked up and I'm not even near a RFT branch
> > yet.
> >
> > Summary: it will be quite some time before I have meta-virt working
> > again, since I feel like I've had a bag of rocks dumped right on top
> > of me and changes to core that I don't have straight in my head yet.
> >
> > Bruce
> >
> > On Fri, May 24, 2024 at 3:40 PM Martin Jansa wrote:
> >> 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
>
Re: [meta-virtualization][scarthgap][PATCH 1/1] buildah: upgrade to 1.34.3
I couldn't merge this prviously, as this would have made the
scarthgap version of buildah newer than the one on master.
But I've bumped master to 1.36, so this is now merged to
scarthgap
Bruce
In message: [meta-virtualization][scarthgap][PATCH 1/1] buildah: upgrade to
1.34.3
on 24/05/2024 Urade, Yogita via lists.yoctoproject.org wrote:
> 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 (#8782):
https://lists.yoctoproject.org/g/meta-virtualization/message/8782
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]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-virtualization][PATCH] lxc: update to 6.0.0
As part of my fixing of the UNPACKDIR and other recent breakages due to oe-core changes, I did a couple of early package updates. I included lxc, and just let my scripts do the uprev work. Could you break the ptest parts out of this and re-submit them on top of master-next ? Bruce On Thu, Apr 18, 2024 at 8:12 AM Bruce Ashfield via lists.yoctoproject.org wrote: > > I'm not taking any package updates at this time, but I'll look at this when I > do go through the next update cycle. > > Bruce > > On Thu, Apr 18, 2024 at 4:31 AM Xiangyu Chen via lists.yoctoproject.org > wrote: >> >> From: Xiangyu Chen >> >> Changes: >> 17ac6f691 lxc.spec: Align SPDX license id >> 5fe2de84c Makefile: Align SPDX license id >> 97f93be72 meson: Align SPDX license id >> d4cd3741d COPYING: Clarify licensing of files without SPDX >> 8e67eb07c doc: Add SPDX headers and remove Author field >> cb94edf53 src/include: Add SPDX headers >> 7bc33ef6e src/tests: Add SPDX headers >> 007642c89 hooks: Add SPDX headers >> 1e9e66be3 lxc.spec: Clear default changelog >> 202d649d1 lxc.spec: Use SPDX >> 85abd4026 template: Use SPDX >> a074b3d27 config/yum: Use SPDX header >> 7ed43e5e9 COPYING: Remove whitespace >> 522721216 MAINTAINERS: Remove Dwight from the maintainer list >> 08bf8b9e2 lxc-checkconfig: Fix shellcheck >> 0f18db543 lxc-checkconfig: Show namespace limits >> f71b8e3f8 lxc-ls: list names with whitespaces in `--active`. >> 816b8973d lxc/tools: set default log_priority to ERROR >> 989ea3969 tools/lxc_autostart: don't fail when there are no containers >> dc4df2335 lxc/lxccontainer: specify file mode in open() call inside mod_rdep >> 630b46ed2 lxc/confile: do not print excess space before scale suffix for >> time.offset.boot >> 796f2ccb7 lxc/confile: do not print newline symbol in getter for >> lxc.time.offset.* >> dcc4fb929 tests/parse_config_file: fix some typos >> 6fea67429 tests/parse_config_file: add tests for lxc.time.offset.* >> ad8f55445 tree-wide: replace multiply_overflow with check_mul_overflow >> 4464cee19 lxccontainer: rework copy_file() >> 9d1aa932d lxccontainer: improve mod_rdep() >> 81c1bbf45 Revert "lxccontainer: fixes" >> 82fe01821 src/lxc/syscall_numbers.h: drop define -1 >> 590a95d83 rexec: Avoid invalid free in rexec failure path >> f9978b179 README: Correct 'armvl7' to 'armv7l' >> 046b63cd2 unshare: simplify lookup_name >> 7452ee8ab lxc-unshare: fix an buffer overflow issue in lxc_unshare >> e3445 lxc-net: Enable IPv6 by default >> d78ca00bc tests/meson: attempt to fix ossfuzz builds >> d18f993b3 github: master -> main >> 86799f554 meson: link with liblxc dynamically everywhere if possible >> b90fecfda network: use IN_LIBLXC >> 9eee450d2 storage_utils: move get_fssize to utils >> 6eb0a73e2 storage_utils: unhide and rename is_valid_storage_type to >> lxc_is_valid_storage_type >> 42eeffcb0 confile: unhide lxc_config_parse_arch() helper >> 9bb318881 conf: reorganize/split code to utils.c >> 863c59dc3 conf: reorganize/split code to idmap_utils.c >> b7591ad49 confile: unhide lxc_config_define*() helpers >> f14656ebf meson: introduce IN_LIBLXC preprocessor macro >> 672b2172d confile: move lxc_fill_elevated_privileges() to tools/lxc_attach >> 8f9733d75 tests: remove old and broken cgroup handling code from tests >> d51ea224e config: apparmor: add AppArmor profile for lxc-copy >> 627bb9460 tests: lxc-test-usernic: use iproute tool instead of brctl >> df0665b6d oci: resolve cross-filesystem blob caching failure >> ec85e5ca4 lxc-test-usernic: drop cgroup handling >> 27ec0b0f6 test-usernic: don't use ifconfig >> 44e845b3c Add x32 to the list of recognized architectures >> 07e3a516e lxc-download, lxc-local: preserve xattrs on unpack >> 9ac7c4895 tree-wide: use container_uses_namespace() in less trivial cases >> 64341ce7b tree-wide: use container_uses_namespace() helper >> 6b40e66c1 Fix error message. >> c8189ee2a Add verbose output in download template. >> 84cc3155a Align columns in lxc-download.in template >> 872db5424 build: add more options for customizing install >> df17ac417 Add loongarch64 support >> 112d5615e build(deps): bump actions/upload-artifact from 3 to 4 >> 789457f1a config: try to create workdir if not exist >> 86f5c1226 lxc-local: Add --no-dev option to exclude /dev from the fstree >> f885a3c56 lxc-local: Re-organize code to use more functions >> 7c025072e lxc-local: Improve usage info >> faa38a197 lxc-local: Change LXC_CONFIG to LXC_METADATA to match args and be >> more clear >> d65fe1b27 Disable IPv6 link-local addresses for bridged veth >> 8cff8fa1a don't try to delete vlan 0 from veth >> 0e932812a conf: fix ephemeral copies >> abffab441 config/init: Drop upstart files >> 79a4a3cf8 doc: remove the warning mentionning upstart >> 7bf1695d0 hooks/ubuntu-cloud-prep: remove upstart handling >> fb73c18d2 meson: Remove support for upstart >> cc6819c69 reset root_nsuid_map and root_nsgid_map when idmaps is cleared >> a87d6fcc9 lxc/checkconfig: use multiline `echo` >> f3e01fa80 lxc/checkconfig: replace
Re: [meta-virtualization][PATCH 1/4] meta-virt: adjust for UNPACKDIR and GO_SRCURI_DESTSUFFIX
As I mentioned on the list earlier this week, I've already dealt with
these issues.
I'm just finalizing a few runtime issues and everything will be pushed
to master-next.
Bruce
On Wed, May 29, 2024 at 5:31 AM Chen Qi via lists.yoctoproject.org
wrote:
>
> From: Chen Qi
>
> The patch is generated by the following commands:
>
> grep -rl WORKDIR * | xargs sed -i -e
> 's#${WORKDIR}/${BP}/src/import#${GO_SRCURI_DESTSUFFIX}#g'
> grep -rl WORKDIR * | xargs sed -i -e 's#${UNPACKDIR}#${UNPACKDIR}#g'
> grep -rEl 'inherit.* go( |$)' * | xargs sed -i -e
> '/destsuffix/!s/protocol=https/protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}/g'
> grep -rl destsuffix * | xargs sed -i -e
> 's#destsuffix=${S}/#destsuffix=${GO_SRCURI_DESTSUFFIX}/../../#g'
> grep -rl UNPACKDIR * | xargs sed -i -e 's#S = "${UNPACKDIR}#S =
> "${WORKDIR}#g'
> grep -rl GOPATH * | xargs sed -i -e '/GOPATH/ s#UNPACKDIR#WORKDIR#g'
> grep -rl '\${UNPACKDIR}/git' * | xargs sed -i -e
> 's#${UNPACKDIR}/git#${WORKDIR}/git#g'
> grep -rl 'toolchain.cmake' * | xargs sed -i -e
> 's#${UNPACKDIR}/toolchain.cmake#${WORKDIR}/toolchain.cmake#g'
>
> What these commands do is:
> 1) use GO_SRCURI_DESTSUFFIX to adapt to latest oe-core change
> 2) avoid absolute path in destsuffix
>This will unnecessarily create ${S} diretory, causing a chaos when doing
> shutil.move.
>The unpack codes in base.bbclass remove ${S} in most cases and then does a
> move.
> 3) Use UNPACKDIR to replace WORKDIR.
>
> Signed-off-by: Chen Qi
> ---
> .../xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb | 4 +-
> recipes-containers/buildah/buildah_git.bb | 2 +-
> .../cgroup-lite/cgroup-lite_1.15.bb | 2 +-
> .../container-host-config.bb | 6 +-
> recipes-containers/cri-o/cri-o_git.bb | 4 +-
> recipes-containers/cri-tools/cri-tools_git.bb | 2 +-
> .../docker-compose/docker-compose_git.bb | 4 +-
> recipes-containers/docker-compose/src_uri.inc | 372
> .../docker-distribution_git.bb| 2 +-
> recipes-containers/docker/docker.inc | 2 +-
> recipes-containers/k3s/k3s_git.bb | 16 +-
> recipes-containers/k3s/src_uri.inc| 860 +-
> .../kubernetes/kubernetes_git.bb | 10 +-
> recipes-containers/lxc/lxc_git.bb | 4 +-
> recipes-containers/nerdctl/nerdctl_git.bb | 4 +-
> recipes-containers/nerdctl/src_uri.inc| 270 +++---
> .../podman-tui/podman-tui_git.bb | 2 +-
> recipes-containers/podman/podman_git.bb | 4 +-
> .../kata-containers/kata-agent_git.bb | 2 +-
> .../kata-containers/kata-proxy_git.bb | 2 +-
> .../kata-containers/kata-runtime_git.bb | 2 +-
> recipes-core/kata-containers/kata-shim_git.bb | 2 +-
> recipes-core/runv/runv_git.bb | 2 +-
> recipes-core/runx/runx_git.bb | 8 +-
> .../helloworld-flask/helloworld-flask_0.1.bb | 18 +-
> recipes-devtools/go/go-build_git.bb | 2 +-
> recipes-devtools/go/go-md2man_git.bb | 2 +-
> recipes-devtools/yq/yq_git.bb | 4 +-
> recipes-extended/ceph/ceph_18.2.2.bb | 6 +-
> recipes-extended/diod/diod_1.0.24.bb | 4 +-
> recipes-extended/images/xtf-image.bb | 4 +-
> recipes-extended/libvirt/libvirt-python.inc | 4 +-
> recipes-extended/libvirt/libvirt_10.0.0.bb| 30 +-
> recipes-extended/nagios/nagios-core_4.4.6.bb | 6 +-
> recipes-extended/nagios/nagios-nrpe_4.0.2.bb | 4 +-
> recipes-extended/nagios/nagios-nsca_2.9.2.bb | 4 +-
> .../uxen/uxen-guest-tools_4.1.8.bb| 2 +-
> .../virt-viewer/virt-viewer_11.0.bb | 2 +-
> recipes-extended/xen/xen.inc | 6 +-
> recipes-networking/cni/cni_git.bb | 8 +-
> recipes-networking/cni/src_uri.inc| 26 +-
> recipes-networking/netns/netns_git.bb | 2 +-
> .../openvswitch/openvswitch.inc | 8 +-
> scripts/oe-go-mod-autogen.py | 12 +-
> 44 files changed, 871 insertions(+), 871 deletions(-)
>
> diff --git
> a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb
>
> b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb
> index 87619d01..f1d3189d 100644
> ---
> a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb
> +++
> b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb
> @@ -17,9 +17,9 @@ do_compile() {
> -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \
> -e 's/@@RPI_DOM0_MEM@@/${RPI_DOM0_MEM}/' \
> -e 's/@@RPI_DEBUG_XEN_ARGS@@/${RPI_DEBUG_XEN_ARGS}/' \
> -"${WORKDIR}/boot.cmd.xen.in" > "${WORKDIR}/boot.cmd"
> +"${UNPACKDIR}/boot.cmd.xen.in" > "${UNPACKDIR}/boot.cmd"
>
> -mkimage -A ${UBOOT_ARCH} -T script -C none -n "Boot script" -d
> "${WORKDIR}/boot.cmd"
Re: [meta-virtualization] [RFC][PATCH 2/3] cni: use GO_SRCURI_DESTSUFFIX
FWIW: my colleague sent me some fixes for my WIP jansa/master branch in:
https://github.com/shr-project/meta-virtualization/pull/1
https://github.com/shr-project/meta-virtualization/pull/2
I haven't shared them as I'm waiting for master-next branch to be
updated to see what's left to fix (and hard to guess what Bruce is
cooking)
On Wed, May 29, 2024 at 11:34 AM ChenQi wrote:
>
> Hi Bruce,
>
> I did some investigation this afternoon. A patch series has been sent,
> which mostly comes from 'grep + sed', and also includes a patch from Martin.
> I did build tests, the result looks good to me. I think the only
> remaining recipes that need to be dealt with are: yq and possibly runv.
> I'll need to do something else tomorrow. Hope you or someone else could
> check more.
> Hope this would help a little bit.
>
> Regards,
> Qi
>
> On 5/28/24 04:37, Bruce Ashfield via lists.yoctoproject.org wrote:
> > As an update. My patience is wearing thin.
> >
> > The posted patches don't build for me, my changes don't build for me,
> > if I hack things, the runtime is broken.
> >
> > I'm seeing different fetching and source management based on the
> > number of git repositories in the SCR_URI, which means I'm running
> > into everything from missing source to license checksum failures when
> > I reorganize the code.
> >
> > I'm stubborn about this sort of thing, there's no sense in me just
> > merging patches that don't build on my machines, and/or patches that I
> > don't understand how they fix issues, since I'll never be able to
> > maintain things afterwards.
> >
> > I am still working on this, but I'm no debugging oe-core code to try
> > and understand what is happening and why the behaviour is changing, so
> > everything is extremely hacked up and I'm not even near a RFT branch
> > yet.
> >
> > Summary: it will be quite some time before I have meta-virt working
> > again, since I feel like I've had a bag of rocks dumped right on top
> > of me and changes to core that I don't have straight in my head yet.
> >
> > Bruce
> >
> > On Fri, May 24, 2024 at 3:40 PM Martin Jansa wrote:
> >> 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
> >> \
> >>
>
Re: [meta-virtualization] [RFC][PATCH 2/3] cni: use GO_SRCURI_DESTSUFFIX
Hi Bruce,
I did some investigation this afternoon. A patch series has been sent,
which mostly comes from 'grep + sed', and also includes a patch from Martin.
I did build tests, the result looks good to me. I think the only
remaining recipes that need to be dealt with are: yq and possibly runv.
I'll need to do something else tomorrow. Hope you or someone else could
check more.
Hope this would help a little bit.
Regards,
Qi
On 5/28/24 04:37, Bruce Ashfield via lists.yoctoproject.org wrote:
As an update. My patience is wearing thin.
The posted patches don't build for me, my changes don't build for me,
if I hack things, the runtime is broken.
I'm seeing different fetching and source management based on the
number of git repositories in the SCR_URI, which means I'm running
into everything from missing source to license checksum failures when
I reorganize the code.
I'm stubborn about this sort of thing, there's no sense in me just
merging patches that don't build on my machines, and/or patches that I
don't understand how they fix issues, since I'll never be able to
maintain things afterwards.
I am still working on this, but I'm no debugging oe-core code to try
and understand what is happening and why the behaviour is changing, so
everything is extremely hacked up and I'm not even near a RFT branch
yet.
Summary: it will be quite some time before I have meta-virt working
again, since I feel like I've had a bag of rocks dumped right on top
of me and changes to core that I don't have straight in my head yet.
Bruce
On Fri, May 24, 2024 at 3:40 PM Martin Jansa wrote:
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 (#8778):
https://lists.yoctoproject.org/g/meta-virtualization/message/8778
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][PATCH 2/4] runc-opencontainers: use GO_SRCURI_DESTSUFFIX
From: Chen Qi
Signed-off-by: Chen Qi
---
recipes-containers/runc/runc-opencontainers_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb
b/recipes-containers/runc/runc-opencontainers_git.bb
index 188b8440..0b709a0d 100644
--- a/recipes-containers/runc/runc-opencontainers_git.bb
+++ b/recipes-containers/runc/runc-opencontainers_git.bb
@@ -2,7 +2,7 @@ include runc.inc
SRCREV = "a9833ff391a71b30069a6c3f816db113379a4346"
SRC_URI = " \
-git://github.com/opencontainers/runc;branch=release-1.1;protocol=https \
+
git://github.com/opencontainers/runc;branch=release-1.1;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}
\
file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
"
RUNC_VERSION = "1.1.12"
--
2.45.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8774):
https://lists.yoctoproject.org/g/meta-virtualization/message/8774
Mute This Topic: https://lists.yoctoproject.org/mt/106365677/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[meta-virtualization][PATCH 3/4] docker-moby: use GO_SRCURI_DESTSUFFIX
From: Chen Qi
Signed-off-by: Chen Qi
---
recipes-containers/docker/docker-moby_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-containers/docker/docker-moby_git.bb
b/recipes-containers/docker/docker-moby_git.bb
index 0abb0b3f..41a6823d 100644
--- a/recipes-containers/docker/docker-moby_git.bb
+++ b/recipes-containers/docker/docker-moby_git.bb
@@ -49,7 +49,7 @@ SRCREV_libnetwork = "67e0588f1ddfaf2faf4c8cae8b7ea2876434d91c"
SRCREV_cli = "01f933261885c0126edb3f47fd56d048ae31265a"
SRCREV_FORMAT = "moby_libnetwork"
SRC_URI = "\
- git://github.com/moby/moby.git;branch=25.0;name=moby;protocol=https \
+
git://github.com/moby/moby.git;branch=25.0;name=moby;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}
\
git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork;protocol=https
\
git://github.com/docker/cli;branch=25.0;name=cli;destsuffix=git/cli;protocol=https
\
file://docker.init \
--
2.45.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8776):
https://lists.yoctoproject.org/g/meta-virtualization/message/8776
Mute This Topic: https://lists.yoctoproject.org/mt/106365679/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[meta-virtualization][PATCH 4/4] linux-yocto_virtualization.inc: adjust path to kcfg for UNPACKDIR
From: "Martin Jansa via lists.yoctoproject.org" * 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 (#8775): https://lists.yoctoproject.org/g/meta-virtualization/message/8775 Mute This Topic: https://lists.yoctoproject.org/mt/106365678/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
