Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install crictl from binary instead of from source #3160

Merged
merged 1 commit into from
Oct 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/package/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ menu "System tools"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/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/crictl-bin/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"
Expand Down
5 changes: 0 additions & 5 deletions deploy/iso/minikube-iso/package/cri-tools/Config.in

This file was deleted.

1 change: 0 additions & 1 deletion deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash

This file was deleted.

36 changes: 0 additions & 36 deletions deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk

This file was deleted.

4 changes: 4 additions & 0 deletions deploy/iso/minikube-iso/package/crictl-bin/Config.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
config BR2_PACKAGE_CRICTL_BIN
bool "crictl-bin"
default y
depends on BR2_x86_64
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256 ccf83574556793ceb01717dc91c66b70f183c60c2bbec70283939aae8fdef768 crictl-v1.11.1-linux-amd64.tar.gz
18 changes: 18 additions & 0 deletions deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
################################################################################
#
# crictl-bin
#
################################################################################

CRICTL_BIN_VERSION = v1.11.1
CRICTL_BIN_SITE = https://github.com/kubernetes-sigs/cri-tools/releases/download/$(CRICTL_BIN_VERSION)
CRICTL_BIN_SOURCE = crictl-$(CRICTL_BIN_VERSION)-linux-amd64.tar.gz
CRICTL_BIN_STRIP_COMPONENTS = 0

define CRICTL_BIN_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 \
$(@D)/crictl \
$(TARGET_DIR)/usr/bin/crictl
endef

$(eval $(generic-package))