Bug#975563: golang-k8s-sigs-structured-merge-diff: Please update to upstream version 4.0 or later
On Sat, Nov 28, 2020 at 11:35 PM Shengjing Zhu wrote: > Hi > > On Sun, Nov 29, 2020 at 12:06 AM El boulangero > wrote: > > > > This broke the build for containerd, and also for docker.io which > embeds containerd: > > > > > https://buildd.debian.org/status/fetch.php?pkg=docker.io=s390x=20.10.0%7Erc1%2Bdfsg1-1=1606547204=0 > > > > /<>/.gopath/src/ > github.com/containerd/containerd/vendor/sigs.k8s.io/structured-merge-diff/v3/value > (vendor tree) > > /usr/lib/go-1.15/src/sigs.k8s.io/structured-merge-diff/v3/value (from > $GOROOT) > > /<>/.gopath/src/sigs.k8s.io/structured-merge-diff/v3/value > (from $GOPATH) > > > > (the latest containerd builds were still against > k8s-structured-merge-diff v3, so they succeeded, only this docker.io > build was late enough to pick up the v4) > > > > By any chance, do you know if simply patching to use v4 instead of v3 in > the import path will work? Or is there another way to handle this? > > > > The code in k8s-structured-merge-diff which containerd uses, is same > in v3 and v4. So in containerd, I just relax the version, > > https://salsa.debian.org/go-team/packages/containerd/-/blob/debian/sid/debian/patches/0004-relax-structured-merge-diff-version.patch Thanks for that! I didn't realize that containerd 1.4.1 used structured-merge-diff v3, while containerd 1.4.2 that was just releases uses v4. So basically, no problem. Sorry for the noise! > > -- > Shengjing Zhu >
Bug#975563: golang-k8s-sigs-structured-merge-diff: Please update to upstream version 4.0 or later
Hi On Sun, Nov 29, 2020 at 12:06 AM El boulangero wrote: > > This broke the build for containerd, and also for docker.io which embeds > containerd: > > https://buildd.debian.org/status/fetch.php?pkg=docker.io=s390x=20.10.0%7Erc1%2Bdfsg1-1=1606547204=0 > > /<>/.gopath/src/github.com/containerd/containerd/vendor/sigs.k8s.io/structured-merge-diff/v3/value > (vendor tree) > /usr/lib/go-1.15/src/sigs.k8s.io/structured-merge-diff/v3/value (from $GOROOT) > /<>/.gopath/src/sigs.k8s.io/structured-merge-diff/v3/value (from > $GOPATH) > > (the latest containerd builds were still against k8s-structured-merge-diff > v3, so they succeeded, only this docker.io build was late enough to pick up > the v4) > > By any chance, do you know if simply patching to use v4 instead of v3 in the > import path will work? Or is there another way to handle this? > The code in k8s-structured-merge-diff which containerd uses, is same in v3 and v4. So in containerd, I just relax the version, https://salsa.debian.org/go-team/packages/containerd/-/blob/debian/sid/debian/patches/0004-relax-structured-merge-diff-version.patch -- Shengjing Zhu
Bug#975563: golang-k8s-sigs-structured-merge-diff: Please update to upstream version 4.0 or later
This broke the build for containerd, and also for docker.io which embeds containerd: https://buildd.debian.org/status/fetch.php?pkg=docker.io=s390x=20.10.0%7Erc1%2Bdfsg1-1=1606547204=0 /<>/.gopath/src/ github.com/containerd/containerd/vendor/sigs.k8s.io/structured-merge-diff/v3/value (vendor tree) /usr/lib/go-1.15/src/sigs.k8s.io/structured-merge-diff/v3/value (from $GOROOT) /<>/.gopath/src/sigs.k8s.io/structured-merge-diff/v3/value (from $GOPATH) (the latest containerd builds were still against k8s-structured-merge-diff v3, so they succeeded, only this docker.io build was late enough to pick up the v4) By any chance, do you know if simply patching to use v4 instead of v3 in the import path will work? Or is there another way to handle this? Cheers, Arnaud
Bug#975563: golang-k8s-sigs-structured-merge-diff: Please update to upstream version 4.0 or later
Source: golang-k8s-sigs-structured-merge-diff Severity: wishlist X-Debbugs-Cc: lib...@packages.debian.org In order to package podman 2.1, we need to upgrade the package golang-k8s-sigs-structured-merge-diff to version 4.0 or later. Otherwise podman fails to build with: src/github.com/containers/podman/vendor/k8s.io/apimachinery/pkg/runtime/converter.go:34:2: cannot find package "sigs.k8s.io/structured-merge-diff/v4/value" in any of: /<>/_output/src/github.com/containers/podman/vendor/sigs.k8s.io/structured-merge-diff/v4/value (vendor tree) /usr/lib/go-1.15/src/sigs.k8s.io/structured-merge-diff/v4/value (from $GOROOT) /<>/_output/src/sigs.k8s.io/structured-merge-diff/v4/value (from $GOPATH) -rt -- System Information: Debian Release: bullseye/sid APT prefers testing APT policy: (500, 'testing'), (50, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 5.9.0-1-amd64 (SMP w/4 CPU threads) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
