On Thu, Feb 10, 2022 at 3:05 AM Diego Sueiro <[email protected]> wrote: > > Hi Bruce, > > >> --- > >> recipes-containers/k3s/k3s_git.bb | 10 +++++----- > >> 1 file changed, 5 insertions(+), 5 deletions(-) > >> > >> diff --git a/recipes-containers/k3s/k3s_git.bb > >> b/recipes-containers/k3s/k3s_git.bb > >> index bcfa959..77ad6d4 100644 > >> --- a/recipes-containers/k3s/k3s_git.bb > >> +++ b/recipes-containers/k3s/k3s_git.bb > >> @@ -13,10 +13,9 @@ SRC_URI = > >"git://github.com/rancher/k3s.git;branch=release-1.21;name=k3s;protoco > >> file://0001-Finding-host-local-in-usr- > >libexec.patch;patchdir=src/import \ > >> file://k3s-killall.sh \ > >> " > >> -SRC_URI[k3s.md5sum] = "363d3a08dc0b72ba6e6577964f6e94a5" > >> -SRCREV_k3s = "aa5a0a8c783a8a4475b727a04d6594c0fea09253" > >> +SRCREV_k3s = "101917b0c493dd1effac1074feb1d5462b9a189b" > >> > >> -PV = "v1.21.5+k3s1" > >> +PV = "v1.21.9+k3s1" > >> > >> CNI_NETWORKING_FILES ?= "${WORKDIR}/cni-containerd-net.conf" > >> > >> @@ -30,7 +29,7 @@ PACKAGECONFIG[upx] = ",,upx-native" > >> GO_IMPORT = "import" > >> GO_BUILD_LDFLAGS = "-X > >github.com/rancher/k3s/pkg/version.Version=${PV} \ > >> -X > >github.com/rancher/k3s/pkg/version.GitCommit=${@d.getVar('SRCREV_k3s', > >d, 1)[:8]} \ > >> - -w -s \ > >> + -w -s -v \ > >> " > >> BIN_PREFIX ?= "${exec_prefix}/local" > >> > >> @@ -40,11 +39,12 @@ REQUIRED_DISTRO_FEATURES ?= "seccomp" > >> do_compile() { > >> export > >GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_T > >ARGET}/${prefix}/local/go" > >> export CGO_ENABLED="1" > >> - export GOFLAGS="-mod=vendor" > >> + export GOFLAGS="-mod=vendor -modcacherw" > >> > >> TAGS="static_build ctrd no_btrfs netcgo osusergo providerless" > >> > >> cd ${S}/src/import > >> + ${GO} mod vendor -v && ${GO} mod tidy -v > > > >Unfortunately .. no, we can't take this change. > > > >I'm working on a full update to k3s in master, and it is running into similar > >challenges due to the removal of vendor upstream. > > > Can you please elaborate a bit better what the problem is and why this > solution > is not appropriate for the honister branch?
It isn't appropriate for any branch, not just honister. It is covered in detail on both the OE core and OE architecture mailing list over the past year, to year and a half (with the latest being just recently). The summary is that we can't allow go to do the fetching in the compile phase, everything must be done in the fetch phase. And on top of that, there is a list of requirements around the fetching for it to be correct, and support all the OE features (offline building, licensing, reproducibility, etc). It is probably best summarized by this recent thread: https://lists.openembedded.org/g/openembedded-architecture/topic/88417908#1409 I'm working on a solution, and when something workable is ready, it can be used on honister, as well as master. Bruce > I have no knowledge in Go both in aspects of the programming language as well > as building. > > -- > Diego Sueiro > > >The solution isn't simple, since it is something that has to be generic, as > >it > >applies to many different recipes in meta-virtualization. > > > >Bruce > > > >> ${GO} build -tags "$TAGS" -ldflags "${GO_BUILD_LDFLAGS} -w > >> -s" -o ./dist/artifacts/k3s ./cmd/server/main.go > >> > >> # Use UPX if it is enabled (and thus exists) to compress > >> binary > >> -- > >> 2.35.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 (#7059): https://lists.yoctoproject.org/g/meta-virtualization/message/7059 Mute This Topic: https://lists.yoctoproject.org/mt/89023734/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
