From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D9E5C433F5 for ; Thu, 31 Mar 2022 18:36:31 +0000 (UTC) Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by mx.groups.io with SMTP id smtpd.web08.800.1648751790502702824 for ; Thu, 31 Mar 2022 11:36:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Hj569qsP; spf=pass (domain: gmail.com, ip: 209.85.208.54, mailfrom: bruce.ashfield@gmail.com) Received: by mail-ed1-f54.google.com with SMTP id x34so310948ede.8 for ; Thu, 31 Mar 2022 11:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=RwKYaDbQdvcJSEth50ddzHmCF/TeFTIikqmMEQLZpA8=; b=Hj569qsPzxX6rbq5kjj8mFQnyK7T0/J2o5T+4J2UlvAgiqFXDi4EnRH0bDGLEvyPCJ ZUnQLVfMhqln0weoPgLwPDlb85fHjgw/BHsFfZ8c4rp8krWi55zMC6nA5MN+/N2JQqD/ a6bMpNRUFUaejuFZXVTOyYJnBU2ZYV96LLAQM41lpNTaALya9OjKfybE5hyMdojUWbMY FKa8/Wnemt1mxxo1nMJ1D9SwJ5LLJPKLVd7Qld1AXuwcx2QfFd4V24zsF96Ws4kZZ8Mu VGI9/UAheiB81t2f8bRR0bYoy0bZf4ZmAhfhoIq2giWM1ajvAxwqsiSza8L6p28hhkG7 6OKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=RwKYaDbQdvcJSEth50ddzHmCF/TeFTIikqmMEQLZpA8=; b=LLNJ2ql2HL9AzG9Iif8O/QJqglwh8eIUkkt3y1SGN1mgKw6ZCp4TYkJ7CzSj2pXKr7 2l+qpHDV6vFy934w8eYaqdX26o3PWcvngqAhXxqtvEYMGNtq0nMHQ1grX5E5Kc8a+gX3 Xa25jXVj1jkgAdUTnTeK9qJOmAyvY+cCr5TVmR/HCcIRIYZb55fXyb0kpgJ4uGaDrAKa lKy/Mm1J0I/jnxlEKrcwz7ar4BRevgCJkZKqPXd/bxGALsp56oR4W+DirGNaQb2Bc0d6 pIeaxGH718ioND1AY8ZPpuLLLOrwcD97Wai0hi7AXCQp3c5ND3/59JB3dyHXF+KzRcIF k0rg== X-Gm-Message-State: AOAM530EtmR4Ckz1tlphp+fQJSoWmwKA6L8ZjTnNA5lmU4fCBdYyB9w0 de4OpSsynT0x2qOyhOVF3aZ6x/Ng6bsnU/944Qs= X-Google-Smtp-Source: ABdhPJxi4TSHScyyq7u+MeWdtikijWMspRbKNFHGoquz4A2mE86QzGUjxTPdR+RNmcIfo4rqDui9pzD3Q1JJJDsruC4= X-Received: by 2002:a05:6402:d4c:b0:410:a415:fd95 with SMTP id ec12-20020a0564020d4c00b00410a415fd95mr17388125edb.288.1648751788556; Thu, 31 Mar 2022 11:36:28 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Bruce Ashfield Date: Thu, 31 Mar 2022 14:36:17 -0400 Message-ID: Subject: Re: k3s build issues on master To: Diego Sueiro Cc: "meta-virtualization@lists.yoctoproject.org" , nd Content-Type: multipart/alternative; boundary="000000000000ae03b805db87f0b5" List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 31 Mar 2022 18:36:31 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-virtualization/message/7123 --000000000000ae03b805db87f0b5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 31, 2022 at 2:05 PM Diego Sueiro wrote: > Hi Bruce, > ------------------------------ > *From:* Bruce Ashfield > *Sent:* 31 March 2022 17:38 > *To:* Diego Sueiro > *Cc:* meta-virtualization@lists.yoctoproject.org < > meta-virtualization@lists.yoctoproject.org>; nd > *Subject:* Re: k3s build issues on master > > > > On Thu, Mar 31, 2022 at 12:22 PM Diego Sueiro > wrote: > > Hi Bruce, > > Whilst investigating a build problem on our CI related to sstate mirror o= f > the k3s recipe, I found that the commit "k3s: update to 1.23.1" (8cba0652= 09dd668afe939f878da340a017ecdd7d) > didn't change the PV and SRCREV_k3s variables correctly. > > I changed those values to v1.23.1+k3s1 > and 08d538fb3a04a0fe904b34cf04f7e21191b82449 respectively and now I'm > getting the following do_compile error: > ``` > go: inconsistent vendoring in > /kas_build_dir/tmp/work/neoversen1-poky-linux/k3s/v1.23.3+k3s1-r0/k3s-v1.= 23.3+k3s1/src/import: > github.com/google/cadvisor@v0.43.0: is explicitly required in go.mod, > but not marked as explicit in vendor/modules.txt > [...] > k8s.io/sample-controller: is marked as replaced by > github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller@v1.22.6= -k3s1 > in vendor/modules.txt, but replaced by > github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller@v1.23.3= -k3s1 > in go.mod > > To ignore the vendor directory, use -mod=3Dreadonly or -mod=3Dmod. > To sync the vendor directory, run: > go mod vendor > ``` > > > The short log is wrong, the SRCREV and PV are correct. There's some > fundamental issues with 1.23.x that prevented it from building inside or > outside of bitbake, so I scaled back the version bump at the last minute = to > stay in 1.22.x series. > > > In this case it seems that thev1.22.6+k3s1 > tag is pointing > to 3228d9cb9a4727d48f60de4f1ab472f7c50df904. > The SRCREV is as intended. It is not intended to be that tag exactly, it is the tip of the 1.22.x branch (and that's what all of them have been throughout the history of the recipes). We can use +git${SRCPV} in the recipe, but honestly, that's not the biggest challenge with the go mod chaos, but I'll add it as part of my next update. Cheers, Bruce > > Cheers, > > Diego > > And yes, there's no more vendoring in k3s, so you can't just bump the > SRCREV and PV, we have to adjust all of the git clones and shuffling to > make it build. > > I have some more changes to that recipe pending, so I'll do a minor > cleanup, with a shortlog that makes things clear. > > > Cheers, > > Bruce > > > > Unfortunately, I have zero knowledge in go and I have no idea how I could > fix this. > > > Diego Sueiro > Staff Software Developer =E2=80=93 ARM =E2=80=93 Automotive and Industria= l Solutions > (CE-OSS) > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await the= e > at its end > - "Use the force Harry" - Gandalf, Star Trek II > > --=20 - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II --000000000000ae03b805db87f0b5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Mar 31, 2022 at 2:05 PM Diego Sueiro <Diego.Sueiro@arm.com> wrote:
Hi Bruce,
Fro= m: Bruce Ashfield <bruce.ashfield@gmail.com>
Sent: 31 March 2022 17:38
To: Diego Sueiro <Diego.Sueiro@arm.com>
Cc: meta-virtualization@lists.yoctoproject.org <me= ta-virtualization@lists.yoctoproject.org>; nd <nd@arm.com>
Subject: Re: k3s build issues on master
=C2=A0


On Thu, Mar 31, 2022 at 12:22 PM Diego Sueiro <Diego.Sueiro@arm.com= > wrote:
Hi Bruce,

Whilst investigating a build problem on our CI related to sstate mirror of = the k3s recipe, I found that the commit "k3s: update to 1.23.1"=C2=A0(8cba065209dd668afe939f878da340a017ecdd7d) di= dn't change the PV and=C2=A0SRCREV_k3s variables correctly.

I changed those values to=C2=A0v1.23.1+k3s1 and=C2=A008d538fb3a04a0fe904b34= cf04f7e21191b82449 respectively and now I'm getting the following do_co= mpile error:
```
go: inconsistent vendoring in /kas_build_dir/tmp/work/neoversen1-poky-linux= /k3s/v1.23.3+k3s1-r0/k3s-v1.23.3+k3s1/src/import:
=C2=A0 =C2=A0 github.com/google/cadvisor@v0.43.0: is explicitly required in go.mod, b= ut not marked as explicit in vendor/modules.txt
[...= ]
=C2= =A0 =C2=A0 k8s.io/sample-controller: is marked as replaced by github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller@v1.22.6-k= 3s1 in vendor/modules.txt, but replaced by github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller@v1.23.3-k= 3s1 in go.mod

=C2=A0 =C2=A0 To ignore the vendor directory, use -mod=3Dreadonly or -= mod=3Dmod.
=C2=A0 =C2=A0 To sync the vendor directory, run:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 go mod vendor
```


The short log is wrong, the SRCREV and PV ar= e correct. There's some fundamental issues with 1.23.x that prevented i= t from building inside or outside of bitbake, so I scaled back the version = bump at the last minute to stay in 1.22.x series.

In this case it seems that thev1.2= 2.6+k3s1=C2=A0tag is pointing to=C2=A03228d9cb9a4727d48f60de4f1ab472f7c50df904.
<= /div>

The SRCREV is as intended. It is not in= tended to be that tag exactly, it is the tip of the 1.22.x branch (and that= 's what all of them have been throughout the history of the recipes).

We can use=C2=A0+git${SRCP= V} in the recipe, but honestly, that's not the biggest challenge with t= he go mod chaos, but I'll add it as part of my next update.

Cheers,

Bruce

=C2=A0
<= div>

Cheers,

Diego

And yes, there's no more vendoring in k3= s, so you can't just bump the SRCREV and PV, we have to adjust all of t= he git clones and shuffling to make it build.

I have some more changes to that recipe pend= ing, so I'll do a minor cleanup, with a shortlog that makes things clea= r.

Cheers,

Bruce

=C2=A0
Unfortunately, I have zero knowledge in go and I have no idea how I could f= ix this.=C2=A0

Diego Sueiro
Staff Software Developer =E2=80=93 ARM =E2=80=93=C2=A0Automotive and Industrial Solutions (CE-OSS)



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



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

--000000000000ae03b805db87f0b5--