Hi On Sun, Nov 29, 2020 at 12:06 AM El boulangero <elboulang...@gmail.com> 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&arch=s390x&ver=20.10.0%7Erc1%2Bdfsg1-1&stamp=1606547204&raw=0 > > /<<PKGBUILDDIR>>/.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) > /<<PKGBUILDDIR>>/.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
