I've already got this one queued, I'm doing some extra testing and expect to push it next week.
Bruce On Fri, Feb 15, 2019 at 9:56 AM Stefan Agner <[email protected]> wrote: > > From: Stefan Agner <[email protected]> > > Update containerd to the latest release of the 1.2.x branch. We have > to tweak the go compile patch, but otherwise, the build is unchanged. > > Signed-off-by: Stefan Agner <[email protected]> > --- > .../containerd/containerd-opencontainers_git.bb | 4 ++-- > .../files/0001-build-use-oe-provided-GO-and-flags.patch | 13 > +++++++------ > 2 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb > b/recipes-containers/containerd/containerd-opencontainers_git.bb > index 7755f7d..f7d8645 100644 > --- a/recipes-containers/containerd/containerd-opencontainers_git.bb > +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb > @@ -1,4 +1,4 @@ > -SRCREV = "0190e5f3900227fc739afbc8f4a03df968dc337b" > +SRCREV = "e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e" > SRC_URI = "git://github.com/containerd/containerd;nobranch=1 \ > file://0001-build-use-oe-provided-GO-and-flags.patch \ > " > @@ -7,7 +7,7 @@ include containerd.inc > > LIC_FILES_CHKSUM = > "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" > > -CONTAINERD_VERSION = "v1.2.0" > +CONTAINERD_VERSION = "v1.2.4" > > PROVIDES += "virtual/containerd" > RPROVIDES_${PN} = "virtual/containerd" > diff --git > a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch > > b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch > index c2433f1..f6b6a11 100644 > --- > a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch > +++ > b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch > @@ -1,6 +1,6 @@ > -From 408e8b526d490af817a64b7220e8e2c3789de58f Mon Sep 17 00:00:00 2001 > -From: Bruce Ashfield <[email protected]> > -Date: Sun, 10 Feb 2019 23:46:06 +0000 > +From 6e76a23b831c1c8d39e14afe7ef1368eacaa778a Mon Sep 17 00:00:00 2001 > +From: Stefan Agner <[email protected]> > +Date: Fri, 15 Feb 2019 13:37:19 +0000 > Subject: [PATCH] build: use oe provided GO and flags > > We want to use the go compiler as defined in the oe-enviroment, not the > @@ -8,6 +8,7 @@ generic call to 'go'. Without changing this, we'll get things > like cgo > errors and invalid flag combos. > > Signed-off-by: Bruce Ashfield <[email protected]> > +Signed-off-by: Stefan Agner <[email protected]> > --- > Makefile | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > @@ -20,8 +21,8 @@ index 8e680133..fd7d2813 100644 > # Build a binary from a cmd. > bin/%: cmd/% FORCE > @echo "$(WHALE) $@${BINARY_SUFFIX}" > -- @go build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o > $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS} ./$< > -+ @$(GO) build ${GO_BUILD_FLAGS} ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} > ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS} ./$< > +- @go build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} > ${GO_LDFLAGS} ${GO_TAGS} ./$< > ++ @$(GO) build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} > ${GO_LDFLAGS} ${GO_TAGS} ./$< > > bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for > a static shim build: > https://github.com/golang/go/issues/17789#issuecomment-258542220 > @echo "$(WHALE) bin/containerd-shim" > @@ -41,5 +42,5 @@ index 8e680133..fd7d2813 100644 > binaries: $(BINARIES) ## build binaries > @echo "$(WHALE) $@" > -- > -2.19.1 > +2.13.6 > > -- > 2.13.6 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
