Remove unnecessary hardcoded amd64/x86_64 arch

* Rename docker-bin to docker-amd64-bin * Add a needed dependency to vbox-guest
kubernetes · Jun 18, 2021 · d1d402e · d1d402e
1 parent 015a6c1
commit d1d402e
Show file tree

Hide file tree

Showing 20 changed files with 34 additions and 27 deletions.
diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in
@@ -5,7 +5,7 @@ menu "System tools"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/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/docker-amd64-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-plugins/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hyperv-daemons/Config.in"

diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk
@@ -4,10 +4,18 @@
 #
 ################################################################################
 
+ifeq ($(BR2_x86_64),y)
+GO_ARCH = amd64
+else ifeq ($(BR2_aarch64),y)
+GO_ARCH = arm64
+else
+GO_ARCH = $(BR2_ARCH)
+endif
+
 BUILDKIT_BIN_VERSION = v0.8.2
 BUILDKIT_BIN_COMMIT = 9065b18ba4633c75862befca8188de4338d9f94a
 BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION)
-BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz
+BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-$(GO_ARCH).tar.gz
 
 # https://github.com/opencontainers/runc.git
 BUILDKIT_RUNC_VERSION = 12644e614e25b05da6fd08a38ffa0cfe1903fdec

diff --git a/deploy/iso/minikube-iso/package/cni-plugins/Config.in b/deploy/iso/minikube-iso/package/cni-plugins/Config.in
@@ -1,5 +1,4 @@
 config BR2_PACKAGE_CNI_PLUGINS
 	bool "cni-plugins"
 	default y
-	depends on BR2_x86_64
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
diff --git a/deploy/iso/minikube-iso/package/cni-plugins/cni-plugins.hash b/deploy/iso/minikube-iso/package/cni-plugins/cni-plugins.hash
@@ -1,4 +1,3 @@
-sha256 f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d  cni-plugins-amd64-v0.6.0.tgz
 sha256 8589670f7f9b211a351dfcd211d4fe0b961d77283a7415443dc188f3dbf05668  v0.6.0.tar.gz
 sha256 92c7599918be0a720ac020f137cdeac746dfa03da6b26e08a37132c5728c091f  v0.7.5.tar.gz
 sha256 9d1526ed965ac6562fd95a931ab2346b3c5efd58c2f569038ba3c530f7e66472  v0.8.5.tar.gz
diff --git a/deploy/iso/minikube-iso/package/cni/Config.in b/deploy/iso/minikube-iso/package/cni/Config.in
@@ -1,5 +1,4 @@
 config BR2_PACKAGE_CNI
 	bool "cni"
 	default y
-	depends on BR2_x86_64
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
diff --git a/deploy/iso/minikube-iso/package/cni/cni.hash b/deploy/iso/minikube-iso/package/cni/cni.hash
@@ -1,6 +1,3 @@
-sha256 b1ae09833a238c51161918a8849031efdb46cf0068ea5b752e362d9836e2af7d  cni-v0.3.0.tgz
-sha256 84c9a0a41b59211d560bef14bf3f53bb370156f9ac7762270b3848fed96e1be8  cni-v0.4.0.tgz
-sha256 a7f84a742c8f3a95843b3cc636444742554a4853835649ec371a07c841daebab  cni-amd64-v0.6.0.tgz
 sha256 802f4a002b4eb774624a9dc1c859d3c9926eb2d862e66a673fc99cfc8bcd7494  v0.6.0.tar.gz
 sha256 78d57477d6b0ab9dc4d75ce9f275302d2f379206b5326503e57d9c08b76484c1  v0.7.0.tar.gz
 sha256 4517eabfd65aea2012dc48d057bf889a0a41ed9837387d95cd1e36c0dbddcfd4  v0.7.1.tar.gz
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/Config.in b/deploy/iso/minikube-iso/package/containerd-bin/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_CONTAINERD_BIN
 	bool "containerd-bin"
 	default y
-	depends on BR2_x86_64
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS

diff --git a/deploy/iso/minikube-iso/package/crictl-bin/Config.in b/deploy/iso/minikube-iso/package/crictl-bin/Config.in
@@ -1,4 +1,4 @@
 config BR2_PACKAGE_CRICTL_BIN
 	bool "crictl-bin"
 	default y
-	depends on BR2_x86_64
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
diff --git a/deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.mk b/deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.mk
@@ -4,9 +4,17 @@
 #
 ################################################################################
 
+ifeq ($(BR2_x86_64),y)
+GO_ARCH = amd64
+else ifeq ($(BR2_aarch64),y)
+GO_ARCH = arm64
+else
+GO_ARCH = $(BR2_ARCH)
+endif
+
 CRICTL_BIN_VERSION = v1.19.0
 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_SOURCE = crictl-$(CRICTL_BIN_VERSION)-linux-$(GO_ARCH).tar.gz
 CRICTL_BIN_STRIP_COMPONENTS = 0
 
 define CRICTL_BIN_INSTALL_TARGET_CMDS

diff --git a/deploy/iso/minikube-iso/package/crio-bin/Config.in b/deploy/iso/minikube-iso/package/crio-bin/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_CRIO_BIN
 	bool "crio-bin"
 	default y
-	depends on BR2_x86_64
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS

diff --git a/deploy/iso/minikube-iso/package/docker-amd64-bin/Config.in b/deploy/iso/minikube-iso/package/docker-amd64-bin/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_DOCKER_AMD64_BIN
+	bool "docker-amd64-bin"
+	default y
+	depends on BR2_x86_64
diff --git a/...nikube-iso/package/docker-bin/daemon.json → ...-iso/package/docker-amd64-bin/daemon.json b/...nikube-iso/package/docker-bin/daemon.json → ...-iso/package/docker-amd64-bin/daemon.json
diff --git a/...be-iso/package/docker-bin/docker-bin.hash → ...ge/docker-amd64-bin/docker-amd64-bin.hash b/...be-iso/package/docker-bin/docker-bin.hash → ...ge/docker-amd64-bin/docker-amd64-bin.hash
diff --git a/...kube-iso/package/docker-bin/docker-bin.mk → ...kage/docker-amd64-bin/docker-amd64-bin.mk b/...kube-iso/package/docker-bin/docker-bin.mk → ...kage/docker-amd64-bin/docker-amd64-bin.mk
@@ -1,18 +1,18 @@
 ################################################################################
 #
-# docker-bin
+# docker-amd64-bin
 #
 ################################################################################
 
-DOCKER_BIN_VERSION = 20.10.6
-DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
-DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
+DOCKER_AMD64_BIN_VERSION = 20.10.6
+DOCKER_AMD64_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
+DOCKER_AMD64_BIN_SOURCE = docker-$(DOCKER_AMD64_BIN_VERSION).tgz
 
-define DOCKER_BIN_USERS
+define DOCKER_AMD64_BIN_USERS
 	- -1 docker -1 - - - - -
 endef
 
-define DOCKER_BIN_INSTALL_TARGET_CMDS
+define DOCKER_AMD64_BIN_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 \
 		$(@D)/docker \
 		$(TARGET_DIR)/bin/docker
@@ -38,17 +38,17 @@ define DOCKER_BIN_INSTALL_TARGET_CMDS
 	# https://kubernetes.io/docs/setup/production-environment/container-runtimes/#docker
 
 	$(INSTALL) -Dm644 \
-		$(DOCKER_BIN_PKGDIR)/daemon.json \
+		$(DOCKER_AMD64_BIN_PKGDIR)/daemon.json \
 		$(TARGET_DIR)/etc/docker/daemon.json
 endef
 
-define DOCKER_BIN_INSTALL_INIT_SYSTEMD
+define DOCKER_AMD64_BIN_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 644 \
 		$(BR2_EXTERNAL)/package/docker-bin/docker.socket \
 		$(TARGET_DIR)/usr/lib/systemd/system/docker.socket
 
 	$(INSTALL) -D -m 644 \
-		$(DOCKER_BIN_PKGDIR)/forward.conf \
+		$(DOCKER_AMD64_BIN_PKGDIR)/forward.conf \
 		$(TARGET_DIR)/etc/sysctl.d/forward.conf
 endef
 

diff --git a/...kube-iso/package/docker-bin/docker.socket → ...so/package/docker-amd64-bin/docker.socket b/...kube-iso/package/docker-bin/docker.socket → ...so/package/docker-amd64-bin/docker.socket
diff --git a/...ikube-iso/package/docker-bin/forward.conf → ...iso/package/docker-amd64-bin/forward.conf b/...ikube-iso/package/docker-bin/forward.conf → ...iso/package/docker-amd64-bin/forward.conf
diff --git a/deploy/iso/minikube-iso/package/docker-bin/Config.in b/deploy/iso/minikube-iso/package/docker-bin/Config.in
diff --git a/deploy/iso/minikube-iso/package/gluster/Config.in b/deploy/iso/minikube-iso/package/gluster/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_GLUSTER
 	bool "gluster"
 	default y
-	depends on BR2_x86_64
 	select BR2_PACKAGE_LIBURCU
 	select BR2_PACKAGE_LIBXML2
 	help

diff --git a/deploy/iso/minikube-iso/package/podman/Config.in b/deploy/iso/minikube-iso/package/podman/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PODMAN
 	bool "podman"
 	default y
-	depends on BR2_x86_64
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS

diff --git a/deploy/iso/minikube-iso/package/vbox-guest/Config.in b/deploy/iso/minikube-iso/package/vbox-guest/Config.in
@@ -2,4 +2,5 @@ config BR2_PACKAGE_VBOX_GUEST
 	bool "vbox-guest"
 	default y
 	depends on BR2_LINUX_KERNEL
+	depends on BR2_x86_64