From 514dda8f2eeb458b469b16e801a1a671473918ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sun, 5 Jul 2020 09:21:23 +0200
Subject: [PATCH] Upgrade crio to 1.18.2

---
 .../patches/crio-bin/v1.18.1/version.patch    | 78 -------------------
 .../package/crio-bin/crio-bin.hash            |  1 +
 .../minikube-iso/package/crio-bin/crio-bin.mk |  4 +-
 3 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100644 deploy/iso/minikube-iso/board/coreos/minikube/patches/crio-bin/v1.18.1/version.patch

diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/patches/crio-bin/v1.18.1/version.patch b/deploy/iso/minikube-iso/board/coreos/minikube/patches/crio-bin/v1.18.1/version.patch
deleted file mode 100644
index 882bc9eadc..0000000000
--- a/deploy/iso/minikube-iso/board/coreos/minikube/patches/crio-bin/v1.18.1/version.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 764a0136a..4148d81eb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -100,7 +100,7 @@ BASE_LDFLAGS = ${SHRINKFLAGS} \
- 	-X ${PROJECT}/internal/version.gitCommit=${COMMIT_NO} \
- 	-X ${PROJECT}/internal/version.gitTreeState=${GIT_TREE_STATE} \
- 
--LDFLAGS = -ldflags '${BASE_LDFLAGS} ${EXTRA_LDFLAGS}'
-+GO_LDFLAGS = -ldflags '${BASE_LDFLAGS} ${EXTRA_LDFLAGS}'
- 
- TESTIMAGE_VERSION := master-1.3.6
- TESTIMAGE_REGISTRY := quay.io/crio
-@@ -157,16 +157,16 @@ bin/pinns:
- 	$(MAKE) -C pinns
- 
- test/copyimg/copyimg: $(GO_FILES) .gopathok
--	$(GO_BUILD) $(GCFLAGS) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/copyimg
-+	$(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/copyimg
- 
- test/checkseccomp/checkseccomp: $(GO_FILES) .gopathok
--	$(GO_BUILD) $(GCFLAGS) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/checkseccomp
-+	$(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/checkseccomp
- 
- bin/crio: $(GO_FILES) .gopathok
--	$(GO_BUILD) $(GCFLAGS) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/crio
-+	$(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/crio
- 
- bin/crio-status: $(GO_FILES) .gopathok
--	$(GO_BUILD) $(GCFLAGS) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/crio-status
-+	$(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/crio-status
- 
- build-static:
- 	$(CONTAINER_RUNTIME) run --rm -it -v $(shell pwd):/cri-o $(TESTIMAGE_NIX) sh -c \
-@@ -216,7 +216,7 @@ bin/crio.cross.%: .gopathok .explicit_phony
- 	TARGET="$*"; \
- 	GOOS="$${TARGET%%.*}" \
- 	GOARCH="$${TARGET##*.}" \
--	$(GO_BUILD) $(LDFLAGS) -tags "containers_image_openpgp btrfs_noversion" -o "$@" $(PROJECT)/cmd/crio
-+	$(GO_BUILD) $(GO_LDFLAGS) -tags "containers_image_openpgp btrfs_noversion" -o "$@" $(PROJECT)/cmd/crio
- 
- local-image:
- 	$(TESTIMAGE_SCRIPT)
-diff --git a/cmd/crio/main.go b/cmd/crio/main.go
-index ab033a47d..fa10f170a 100644
---- a/cmd/crio/main.go
-+++ b/cmd/crio/main.go
-@@ -120,7 +120,7 @@ func main() {
- 	app.Authors = []*cli.Author{{Name: "The CRI-O Maintainers"}}
- 	app.UsageText = usage
- 	app.Description = app.Usage
--	app.Version = "\n" + version.Get().String()
-+	app.Version = version.Version + "\n" + version.Get().String()
- 
- 	var err error
- 	app.Flags, app.Metadata, err = criocli.GetFlagsAndMetadata()
-diff --git a/internal/version/version.go b/internal/version/version.go
-index 7ab5da5a2..19692595e 100644
---- a/internal/version/version.go
-+++ b/internal/version/version.go
-@@ -6,6 +6,7 @@ import (
- 	"fmt"
- 	"io/ioutil"
- 	"os"
-+	"os/exec"
- 	"path/filepath"
- 	"reflect"
- 	"runtime"
-@@ -171,6 +172,9 @@ func getLinkmode() string {
- 		return ""
- 	}
- 
-+	if _, err := exec.LookPath("ldd"); err != nil {
-+		return ""
-+	}
- 	if _, err := utils.ExecCmd("ldd", abspath); err != nil {
- 		if strings.Contains(err.Error(), "not a dynamic executable") {
- 			return "static"
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
index baddc429e9..debd789bc5 100644
--- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
@@ -14,3 +14,4 @@ sha256 23a797762e4544ee7c171ef138cfc1141a3f0acc2838d9965c2a58e53b16c3ae v1.17.0.
 sha256 7967e9218fdfb59d6005a9e19c1668469bc5566c2a35927cffe7de8656bb22c7 v1.17.1.tar.gz
 sha256 865ded95aceb3a33a391b252522682de6b37b39498704c490b3a321dbefaafcb v1.18.0.tar.gz
 sha256 794ddc36c2a20fde91fc6cc2c6f02ebdaea85c69b51b67f3994090dbbdbc2a50 v1.18.1.tar.gz
+sha256 25dc558fbabc987bd58c7eab5230121b258a7b0eb34a49dc6595f1c6f3969116 v1.18.2.tar.gz
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
index 23fce96cc3..c7181af967 100644
--- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CRIO_BIN_VERSION = v1.18.1
-CRIO_BIN_COMMIT = 5cbf694c34f8d1af19eb873e39057663a4830635
+CRIO_BIN_VERSION = v1.18.2
+CRIO_BIN_COMMIT = 7f261aeebffed079b4475dde8b9d602b01973d33
 CRIO_BIN_SITE = https://github.com/cri-o/cri-o/archive
 CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz
 CRIO_BIN_DEPENDENCIES = host-go libgpgme