From 15c9c8dd3888862d1f8db1433079d21bad79c91f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sun, 7 Jan 2018 19:45:42 +0100
Subject: [PATCH] Add crictl from cri-tools, to minikube.iso

We don't need critest, because it requires go anyway.
But kubeadm insists on crictl being available in path.
---
 deploy/iso/minikube-iso/package/Config.in     |  1 +
 .../minikube-iso/package/cri-tools/Config.in  |  5 +++
 .../package/cri-tools/cri-tools.hash          |  1 +
 .../package/cri-tools/cri-tools.mk            | 35 +++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 deploy/iso/minikube-iso/package/cri-tools/Config.in
 create mode 100644 deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash
 create mode 100644 deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk

diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in
index fbec9a82f713..1ad69cbf0c12 100644
--- a/deploy/iso/minikube-iso/package/Config.in
+++ b/deploy/iso/minikube-iso/package/Config.in
@@ -3,6 +3,7 @@ menu "System tools"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/kpod/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cri-tools/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/docker-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-bin/Config.in"
diff --git a/deploy/iso/minikube-iso/package/cri-tools/Config.in b/deploy/iso/minikube-iso/package/cri-tools/Config.in
new file mode 100644
index 000000000000..b82d70116434
--- /dev/null
+++ b/deploy/iso/minikube-iso/package/cri-tools/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_CRI_TOOLS
+	bool "cri-tools"
+	default y
+	depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
diff --git a/deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash b/deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash
new file mode 100644
index 000000000000..bccd476e02f2
--- /dev/null
+++ b/deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash
@@ -0,0 +1 @@
+sha256 e83b5a8ff6fc2c98c3463600e74a86d7dbbea6330f883cd5663cbd59641a8086 v0.2.tar.gz
diff --git a/deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk b/deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk
new file mode 100644
index 000000000000..be507ef5a598
--- /dev/null
+++ b/deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# cri-tools
+#
+################################################################################
+
+CRI_TOOLS_VERSION = v0.2
+CRI_TOOLS_SITE = https://github.com/kubernetes-incubator/cri-tools/archive
+CRI_TOOLS_SOURCE = $(CRI_TOOLS_VERSION).tar.gz
+CRI_TOOLS_LICENSE = Apache-2.0
+CRI_TOOLS_LICENSE_FILES = LICENSE
+CRI_TOOLS_DEPENDENCIES =
+CRI_TOOLS_GOPATH = $(@D)/_output
+CRI_TOOLS_ENV = \
+	CGO_ENABLED=1 \
+	GOPATH="$(CRI_TOOLS_GOPATH)" \
+	PATH=$(CRI_TOOLS_GOPATH)/bin:$(BR_PATH)
+
+
+define CRI_TOOLS_CONFIGURE_CMDS
+	mkdir -p $(CRI_TOOLS_GOPATH)/src/github.com/kubernetes-incubator
+	ln -sf $(@D) $(CRI_TOOLS_GOPATH)/src/github.com/kubernetes-incubator/cri-tools
+endef
+
+define CRI_TOOLS_BUILD_CMDS
+	$(CRI_TOOLS_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) crictl
+endef
+
+define CRI_TOOLS_INSTALL_TARGET_CMDS
+	$(INSTALL) -Dm755 \
+		$(CRI_TOOLS_GOPATH)/bin/crictl \
+		$(TARGET_DIR)/usr/bin/crictl
+endef
+
+$(eval $(generic-package))