From f964aeb898a48128a0a79304ac6025e82e995131 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 25 May 2021 13:17:31 -0400 Subject: cri-tools: update to 1.21 release We update to the latest 1.21 commits, and we refresh our patch for context changes. eb0faebe Bump google.golang.org/grpc from 1.37.1 to 1.38.0 1d34ea0c Add global handler for Interrupt signal d2c028aa Bump k8s.io/cri-api from 0.21.0 to 0.21.1 cac74d4f Bump k8s.io/apimachinery from 0.21.0 to 0.21.1 0e4c365c Bump k8s.io/api from 0.21.0 to 0.21.1 4b956efa Bump k8s.io/kubectl from 0.21.0 to 0.21.1 b3bc7d45 Update golangci-lint to v1.40.1 and fix lints a72896da Bump google.golang.org/grpc from 1.37.0 to 1.37.1 09df93a2 Bump github.com/opencontainers/selinux from 1.8.0 to 1.8.1 8a28583f Clone cri-dockerd from permanent repo 29c6b21e Bump github.com/onsi/gomega from 1.11.0 to 1.12.0 50a297dc Bump github.com/onsi/ginkgo from 1.16.1 to 1.16.2 15eee85f Mention deb/rpm packages hosted on OBS in README 6ead47bd Trim build paths for binaries Signed-off-by: Bruce Ashfield --- ...-build-allow-environmental-CGO-settings-and-pass-dont.patch | 10 +++++----- recipes-containers/cri-tools/cri-tools_git.bb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch index afd7c4bf..189d905a 100644 --- a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch +++ b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch @@ -33,11 +33,11 @@ Signed-off-by: Bruce Ashfield src/import/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54/src/import/Makefile +Index: cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa/src/import/Makefile =================================================================== ---- cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54.orig/src/import/Makefile -+++ cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54/src/import/Makefile -@@ -73,7 +73,8 @@ +--- cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa.orig/src/import/Makefile ++++ cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa/src/import/Makefile +@@ -74,7 +74,8 @@ @$(MAKE) -B $(CRICTL) $(CRICTL): @@ -45,5 +45,5 @@ Index: cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54/src/import/M + $(GO_BUILD) -o $@ \ + -a -pkgdir dontusecurrentpkgs \ -ldflags '$(GO_LDFLAGS)' \ + -trimpath \ -tags '$(BUILDTAGS)' \ - $(PROJECT)/cmd/crictl diff --git a/recipes-containers/cri-tools/cri-tools_git.bb b/recipes-containers/cri-tools/cri-tools_git.bb index ad054e1c..f87ca19d 100644 --- a/recipes-containers/cri-tools/cri-tools_git.bb +++ b/recipes-containers/cri-tools/cri-tools_git.bb @@ -16,7 +16,7 @@ What is not in scope for this project? \ non-exist on the kube-apiserver. \ " -SRCREV_cri-tools = "fa50f4af0f6beba20264bfb3fd4d1d34e42f7b54" +SRCREV_cri-tools = "de32df077e6b0e9e31ce367dfc34c1b6b46e30fa" SRC_URI = "\ git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools \ file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \ -- cgit v1.2.3-54-g00ecf