From 052cec1932a15f13ac9fd1a81b8c2bd2b9c8b4c4 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Tue, 26 Apr 2022 11:50:08 -0700
Subject: [PATCH] try using arch directory

---
 deploy/iso/minikube-iso/Config.in             |  2 +
 .../configs/minikube_aarch64_defconfig        |  0
 .../arch/aarch64/package/Config.in            |  9 ++++
 .../aarch64}/package/cni-aarch64/Config.in    |  0
 .../aarch64}/package/cni-aarch64/cni.hash     |  0
 .../aarch64}/package/cni-aarch64/cni.mk       |  0
 .../package/cni-plugins-aarch64/Config.in     |  0
 .../cni-plugins-aarch64/cni-plugins.hash      |  0
 .../cni-plugins-aarch64/cni-plugins.mk        |  0
 .../containerd-bin-aarch64/50-minikube.preset |  0
 .../package/containerd-bin-aarch64/Config.in  |  0
 .../containerd-bin-aarch64/config.toml        |  0
 .../config.toml.default                       |  0
 .../containerd-bin.hash                       |  0
 .../containerd-bin-aarch64/containerd-bin.mk  |  0
 .../containerd-bin-aarch64/containerd.service |  0
 .../package/cri-dockerd-aarch64}/Config.in    |  0
 .../cri-dockerd-aarch64}/cri-dockerd.hash     |  0
 .../cri-dockerd-aarch64}/cri-dockerd.mk       |  3 +-
 .../package/crictl-bin-aarch64/Config.in      |  0
 .../crictl-bin-aarch64/crictl-bin.hash        |  0
 .../package/crictl-bin-aarch64/crictl-bin.mk  |  0
 .../package/docker-bin-aarch64/Config.in      |  0
 .../package/docker-bin-aarch64/daemon.json    |  0
 .../docker-bin-aarch64/docker-bin.hash        |  0
 .../package/docker-bin-aarch64/docker-bin.mk  |  0
 .../package/docker-bin-aarch64/docker.socket  |  0
 .../package/docker-bin-aarch64/forward.conf   |  0
 .../x86_64}/configs/minikube_x86_64_defconfig |  0
 .../arch/x86_64/package/Config.in             |  9 ++++
 .../x86_64}/package/cni-plugins/Config.in     |  0
 .../package/cni-plugins/cni-plugins.hash      |  0
 .../package/cni-plugins/cni-plugins.mk        |  0
 .../{ => arch/x86_64}/package/cni/Config.in   |  0
 .../{ => arch/x86_64}/package/cni/cni.hash    |  0
 .../{ => arch/x86_64}/package/cni/cni.mk      |  0
 .../package/containerd-bin/50-minikube.preset |  0
 .../x86_64}/package/containerd-bin/Config.in  |  0
 .../package/containerd-bin/config.toml        |  0
 .../containerd-bin/config.toml.default        |  0
 .../containerd-bin/containerd-bin.hash        |  0
 .../package/containerd-bin/containerd-bin.mk  |  0
 .../package/containerd-bin/containerd.service |  0
 .../arch/x86_64/package/cri-dockerd/Config.in |  7 +++
 .../package/cri-dockerd/cri-dockerd.hash      |  3 ++
 .../x86_64/package/cri-dockerd/cri-dockerd.mk | 48 +++++++++++++++++++
 .../x86_64}/package/crictl-bin/Config.in      |  0
 .../package/crictl-bin/crictl-bin.hash        |  0
 .../x86_64}/package/crictl-bin/crictl-bin.mk  |  0
 .../package/docker-bin-x86_64/Config.in       |  0
 .../package/docker-bin-x86_64/daemon.json     |  0
 .../package/docker-bin-x86_64/docker-bin.hash |  0
 .../package/docker-bin-x86_64/docker-bin.mk   |  0
 .../package/docker-bin-x86_64/docker.socket   |  0
 .../package/docker-bin-x86_64/forward.conf    |  0
 deploy/iso/minikube-iso/external.mk           |  2 +
 deploy/iso/minikube-iso/package/Config.in     | 12 -----
 57 files changed, 82 insertions(+), 13 deletions(-)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/configs/minikube_aarch64_defconfig (100%)
 create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/Config.in
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/cni-aarch64/Config.in (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/cni-aarch64/cni.hash (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/cni-aarch64/cni.mk (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/cni-plugins-aarch64/Config.in (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/cni-plugins-aarch64/cni-plugins.hash (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/cni-plugins-aarch64/cni-plugins.mk (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/containerd-bin-aarch64/50-minikube.preset (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/containerd-bin-aarch64/Config.in (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/containerd-bin-aarch64/config.toml (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/containerd-bin-aarch64/config.toml.default (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/containerd-bin-aarch64/containerd-bin.hash (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/containerd-bin-aarch64/containerd-bin.mk (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/containerd-bin-aarch64/containerd.service (100%)
 rename deploy/iso/minikube-iso/{package/cri-dockerd => arch/aarch64/package/cri-dockerd-aarch64}/Config.in (100%)
 rename deploy/iso/minikube-iso/{package/cri-dockerd => arch/aarch64/package/cri-dockerd-aarch64}/cri-dockerd.hash (100%)
 rename deploy/iso/minikube-iso/{package/cri-dockerd => arch/aarch64/package/cri-dockerd-aarch64}/cri-dockerd.mk (96%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/crictl-bin-aarch64/Config.in (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/crictl-bin-aarch64/crictl-bin.hash (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/crictl-bin-aarch64/crictl-bin.mk (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/docker-bin-aarch64/Config.in (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/docker-bin-aarch64/daemon.json (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/docker-bin-aarch64/docker-bin.hash (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/docker-bin-aarch64/docker-bin.mk (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/docker-bin-aarch64/docker.socket (100%)
 rename deploy/iso/minikube-iso/{ => arch/aarch64}/package/docker-bin-aarch64/forward.conf (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/configs/minikube_x86_64_defconfig (100%)
 create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/Config.in
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/cni-plugins/Config.in (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/cni-plugins/cni-plugins.hash (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/cni-plugins/cni-plugins.mk (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/cni/Config.in (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/cni/cni.hash (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/cni/cni.mk (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/containerd-bin/50-minikube.preset (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/containerd-bin/Config.in (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/containerd-bin/config.toml (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/containerd-bin/config.toml.default (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/containerd-bin/containerd-bin.hash (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/containerd-bin/containerd-bin.mk (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/containerd-bin/containerd.service (100%)
 create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in
 create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash
 create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/crictl-bin/Config.in (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/crictl-bin/crictl-bin.hash (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/crictl-bin/crictl-bin.mk (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/docker-bin-x86_64/Config.in (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/docker-bin-x86_64/daemon.json (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/docker-bin-x86_64/docker-bin.hash (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/docker-bin-x86_64/docker-bin.mk (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/docker-bin-x86_64/docker.socket (100%)
 rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/docker-bin-x86_64/forward.conf (100%)

diff --git a/deploy/iso/minikube-iso/Config.in b/deploy/iso/minikube-iso/Config.in
index 0f5c2d952e..909008a785 100644
--- a/deploy/iso/minikube-iso/Config.in
+++ b/deploy/iso/minikube-iso/Config.in
@@ -1 +1,3 @@
 source "$BR2_EXTERNAL_MINIKUBE_PATH/package/Config.in"
+source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/Config.in"
+source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/Config.in"
diff --git a/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig b/deploy/iso/minikube-iso/arch/aarch64/configs/minikube_aarch64_defconfig
similarity index 100%
rename from deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig
rename to deploy/iso/minikube-iso/arch/aarch64/configs/minikube_aarch64_defconfig
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in
new file mode 100644
index 0000000000..583bb3d6e2
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in
@@ -0,0 +1,9 @@
+menu "System tools"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crio-bin-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in"
+endmenu
diff --git a/deploy/iso/minikube-iso/package/cni-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni-aarch64/Config.in
rename to deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/Config.in
diff --git a/deploy/iso/minikube-iso/package/cni-aarch64/cni.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni-aarch64/cni.hash
rename to deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.hash
diff --git a/deploy/iso/minikube-iso/package/cni-aarch64/cni.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni-aarch64/cni.mk
rename to deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.mk
diff --git a/deploy/iso/minikube-iso/package/cni-plugins-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni-plugins-aarch64/Config.in
rename to deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/Config.in
diff --git a/deploy/iso/minikube-iso/package/cni-plugins-aarch64/cni-plugins.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni-plugins-aarch64/cni-plugins.hash
rename to deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.hash
diff --git a/deploy/iso/minikube-iso/package/cni-plugins-aarch64/cni-plugins.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni-plugins-aarch64/cni-plugins.mk
rename to deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.mk
diff --git a/deploy/iso/minikube-iso/package/containerd-bin-aarch64/50-minikube.preset b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/50-minikube.preset
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin-aarch64/50-minikube.preset
rename to deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/50-minikube.preset
diff --git a/deploy/iso/minikube-iso/package/containerd-bin-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin-aarch64/Config.in
rename to deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/Config.in
diff --git a/deploy/iso/minikube-iso/package/containerd-bin-aarch64/config.toml b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin-aarch64/config.toml
rename to deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml
diff --git a/deploy/iso/minikube-iso/package/containerd-bin-aarch64/config.toml.default b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml.default
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin-aarch64/config.toml.default
rename to deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml.default
diff --git a/deploy/iso/minikube-iso/package/containerd-bin-aarch64/containerd-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin-aarch64/containerd-bin.hash
rename to deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash
diff --git a/deploy/iso/minikube-iso/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin-aarch64/containerd-bin.mk
rename to deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk
diff --git a/deploy/iso/minikube-iso/package/containerd-bin-aarch64/containerd.service b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd.service
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin-aarch64/containerd.service
rename to deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd.service
diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/cri-dockerd/Config.in
rename to deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in
diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.hash
rename to deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash
diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
similarity index 96%
rename from deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk
rename to deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
index cd961b6e25..124bc1ec39 100644
--- a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
@@ -20,7 +20,8 @@ CRI_DOCKERD_ENV = \
 	GO111MODULE=on \
 	GOPATH="$(CRI_DOCKERD_GOPATH)" \
 	GOBIN="$(CRI_DOCKERD_GOPATH)/bin" \
-	PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH)
+	PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \
+	GOARCH=arm64
 
 CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd
 CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'"
diff --git a/deploy/iso/minikube-iso/package/crictl-bin-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/crictl-bin-aarch64/Config.in
rename to deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/Config.in
diff --git a/deploy/iso/minikube-iso/package/crictl-bin-aarch64/crictl-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/crictl-bin-aarch64/crictl-bin.hash
rename to deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.hash
diff --git a/deploy/iso/minikube-iso/package/crictl-bin-aarch64/crictl-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/crictl-bin-aarch64/crictl-bin.mk
rename to deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.mk
diff --git a/deploy/iso/minikube-iso/package/docker-bin-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-aarch64/Config.in
rename to deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/Config.in
diff --git a/deploy/iso/minikube-iso/package/docker-bin-aarch64/daemon.json b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/daemon.json
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-aarch64/daemon.json
rename to deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/daemon.json
diff --git a/deploy/iso/minikube-iso/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-aarch64/docker-bin.hash
rename to deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash
diff --git a/deploy/iso/minikube-iso/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-aarch64/docker-bin.mk
rename to deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk
diff --git a/deploy/iso/minikube-iso/package/docker-bin-aarch64/docker.socket b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker.socket
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-aarch64/docker.socket
rename to deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker.socket
diff --git a/deploy/iso/minikube-iso/package/docker-bin-aarch64/forward.conf b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/forward.conf
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-aarch64/forward.conf
rename to deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/forward.conf
diff --git a/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig b/deploy/iso/minikube-iso/arch/x86_64/configs/minikube_x86_64_defconfig
similarity index 100%
rename from deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig
rename to deploy/iso/minikube-iso/arch/x86_64/configs/minikube_x86_64_defconfig
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
new file mode 100644
index 0000000000..cc77125dc6
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
@@ -0,0 +1,9 @@
+menu "System tools"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crio-bin/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin-x86_64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in"
+endmenu
diff --git a/deploy/iso/minikube-iso/package/cni-plugins/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni-plugins/Config.in
rename to deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/Config.in
diff --git a/deploy/iso/minikube-iso/package/cni-plugins/cni-plugins.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni-plugins/cni-plugins.hash
rename to deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.hash
diff --git a/deploy/iso/minikube-iso/package/cni-plugins/cni-plugins.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni-plugins/cni-plugins.mk
rename to deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.mk
diff --git a/deploy/iso/minikube-iso/package/cni/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/cni/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni/Config.in
rename to deploy/iso/minikube-iso/arch/x86_64/package/cni/Config.in
diff --git a/deploy/iso/minikube-iso/package/cni/cni.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni/cni.hash
rename to deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.hash
diff --git a/deploy/iso/minikube-iso/package/cni/cni.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/cni/cni.mk
rename to deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.mk
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/50-minikube.preset b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/50-minikube.preset
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin/50-minikube.preset
rename to deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/50-minikube.preset
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin/Config.in
rename to deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/Config.in
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/config.toml b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin/config.toml
rename to deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/config.toml.default b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml.default
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin/config.toml.default
rename to deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml.default
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash
rename to deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk
rename to deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd.service b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd.service
similarity index 100%
rename from deploy/iso/minikube-iso/package/containerd-bin/containerd.service
rename to deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd.service
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in
new file mode 100644
index 0000000000..57d2e21825
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_CRI_DOCKERD
+	bool "cri-dockerd"
+	default y
+	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
+	select BR2_PACKAGE_DOCKER_BIN
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash
new file mode 100644
index 0000000000..1693e1b9d4
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash
@@ -0,0 +1,3 @@
+sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz
+sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz
+sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk
new file mode 100644
index 0000000000..f7a57a24b0
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk
@@ -0,0 +1,48 @@
+################################################################################
+#
+# cri-dockerd
+#
+################################################################################
+
+# As of 2022-02-03
+CRI_DOCKERD_VER = 0.2.0
+CRI_DOCKERD_REV = a4d1895
+CRI_DOCKERD_VERSION = a4d1895a2659ea9974bd7528a706592ab8b74181
+CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive
+CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz
+
+CRI_DOCKERD_DEPENDENCIES = host-go
+
+CRI_DOCKERD_GOPATH = $(@D)/_output
+CRI_DOCKERD_ENV = \
+	$(GO_TARGET_ENV) \
+	CGO_ENABLED=0 \
+	GO111MODULE=on \
+	GOPATH="$(CRI_DOCKERD_GOPATH)" \
+	GOBIN="$(CRI_DOCKERD_GOPATH)/bin" \
+	PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \
+	GOARCH=amd64
+
+CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd
+CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'"
+
+define CRI_DOCKERD_BUILD_CMDS
+	$(CRI_DOCKERD_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_VER) REVISION=$(CRI_DOCKERD_REV) static-linux
+endef
+
+define CRI_DOCKERD_INSTALL_TARGET_CMDS
+	$(INSTALL) -Dm755 \
+		$(@D)/packaging/static/build/linux/cri-dockerd/cri-dockerd \
+		$(TARGET_DIR)/usr/bin/cri-dockerd
+endef
+
+define CRI_DOCKERD_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -Dm644 \
+		$(@D)/packaging/systemd/cri-docker.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/cri-docker.service
+	$(INSTALL) -Dm644 \
+		$(@D)/packaging/systemd/cri-docker.socket \
+		$(TARGET_DIR)/usr/lib/systemd/system/cri-docker.socket
+endef
+
+$(eval $(generic-package))
diff --git a/deploy/iso/minikube-iso/package/crictl-bin/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/crictl-bin/Config.in
rename to deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/Config.in
diff --git a/deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.hash
rename to deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.hash
diff --git a/deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.mk
rename to deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.mk
diff --git a/deploy/iso/minikube-iso/package/docker-bin-x86_64/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-x86_64/Config.in
rename to deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/Config.in
diff --git a/deploy/iso/minikube-iso/package/docker-bin-x86_64/daemon.json b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/daemon.json
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-x86_64/daemon.json
rename to deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/daemon.json
diff --git a/deploy/iso/minikube-iso/package/docker-bin-x86_64/docker-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/docker-bin.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-x86_64/docker-bin.hash
rename to deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/docker-bin.hash
diff --git a/deploy/iso/minikube-iso/package/docker-bin-x86_64/docker-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/docker-bin.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-x86_64/docker-bin.mk
rename to deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/docker-bin.mk
diff --git a/deploy/iso/minikube-iso/package/docker-bin-x86_64/docker.socket b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/docker.socket
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-x86_64/docker.socket
rename to deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/docker.socket
diff --git a/deploy/iso/minikube-iso/package/docker-bin-x86_64/forward.conf b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/forward.conf
similarity index 100%
rename from deploy/iso/minikube-iso/package/docker-bin-x86_64/forward.conf
rename to deploy/iso/minikube-iso/arch/x86_64/package/docker-bin-x86_64/forward.conf
diff --git a/deploy/iso/minikube-iso/external.mk b/deploy/iso/minikube-iso/external.mk
index d444740c8f..bf23d8f68d 100644
--- a/deploy/iso/minikube-iso/external.mk
+++ b/deploy/iso/minikube-iso/external.mk
@@ -1 +1,3 @@
 include $(sort $(wildcard $(BR2_EXTERNAL_MINIKUBE_PATH)/package/*/*.mk))
+include $(sort $(wildcard $(BR2_EXTERNAL_MINIKUBE_PATH)/arch/x86_64/package/*/*.mk))
+include $(sort $(wildcard $(BR2_EXTERNAL_MINIKUBE_PATH)/arch/aarch64/package/*/*.mk))
diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in
index b8456ead38..636898ae7d 100644
--- a/deploy/iso/minikube-iso/package/Config.in
+++ b/deploy/iso/minikube-iso/package/Config.in
@@ -3,22 +3,10 @@ menu "System tools"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in"
-    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/crictl-bin-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/docker-bin-x86_64/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/docker-bin-aarch64/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cri-dockerd/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-aarch64/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-plugins/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-plugins-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hyperv-daemons/Config.in"
     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/containerd-bin-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/buildkit-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/scheduled-stop/Config.in"