From 5f923c7c0697ceba60e7d3c7ee9ea477a77f8ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Mon, 9 Nov 2020 17:48:17 +0100 Subject: [PATCH] Add buildkit binaries to the ISO installation --- deploy/iso/minikube-iso/package/Config.in | 1 + .../package/buildkit-bin/Config.in | 4 ++++ .../package/buildkit-bin/buildkit-bin.hash | 1 + .../package/buildkit-bin/buildkit-bin.mk | 20 +++++++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 deploy/iso/minikube-iso/package/buildkit-bin/Config.in create mode 100644 deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash create mode 100644 deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index dc7a8c85c2..e4a5d0e159 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -13,5 +13,6 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/vbox-guest/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/containerd-bin/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/buildkit-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in" endmenu diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/Config.in b/deploy/iso/minikube-iso/package/buildkit-bin/Config.in new file mode 100644 index 0000000000..6ccb484693 --- /dev/null +++ b/deploy/iso/minikube-iso/package/buildkit-bin/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_BUILDKIT_BIN + bool "buildkit-bin" + default y + depends on BR2_x86_64 diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash new file mode 100644 index 0000000000..bfc3e3ad46 --- /dev/null +++ b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash @@ -0,0 +1 @@ +sha256 33bcaa49b31bc3a277ac75d32fce3f5442d39f53a1799b8624e985279b579f74 buildkit-v0.7.2.linux-amd64.tar.gz diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk new file mode 100644 index 0000000000..78f7f7ea38 --- /dev/null +++ b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# buildkit-bin +# +################################################################################ + +BUILDKIT_BIN_VERSION = v0.7.2 +BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION) +BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz + +define BUILDKIT_BIN_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 \ + $(@D)/buildctl \ + $(TARGET_DIR)/usr/bin/buildctl + $(INSTALL) -D -m 0755 \ + $(@D)/buildkitd \ + $(TARGET_DIR)/usr/sbin/buildkitd +endef + +$(eval $(generic-package))