build cni the same way

deploy/iso/minikube-iso/arch/aarch64/package/Config.in

@@ -4,7 +4,6 @@ menu "System tools aarch64"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-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"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/podman-aarch64/Config.in"

deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/Config.in

@@ -1,5 +0,0 @@
-config BR2_PACKAGE_CNI_AARCH64
-	bool "cni"
-	default y
-	depends on BR2_aarch64
-	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS

deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.mk

@@ -1,45 +0,0 @@
-################################################################################
-#
-# cni
-#
-################################################################################
-
-CNI_AARCH64_VERSION = v0.7.1
-CNI_AARCH64_SITE = https://github.com/containernetworking/cni/archive
-CNI_AARCH64_SOURCE = $(CNI_AARCH64_VERSION).tar.gz
-CNI_AARCH64_LICENSE = Apache-2.0
-CNI_AARCH64_LICENSE_FILES = LICENSE
-
-CNI_AARCH64_DEPENDENCIES = host-go
-
-CNI_AARCH64_GOPATH = $(@D)/_output
-CNI_AARCH64_MAKE_ENV = \
-	$(GO_TARGET_ENV) \
-	CGO_ENABLED=0 \
-	GO111MODULE=off \
-	GOPATH="$(CNI_AARCH64_GOPATH)" \
-	PATH=$(CNI_AARCH64_GOPATH)/bin:$(BR_PATH) \
-	GOARCH=arm64
-
-CNI_AARCH64_BUILDFLAGS = -a --ldflags '-extldflags \"-static\"'
-
-define CNI_AARCH64_CONFIGURE_CMDS
-        mkdir -p $(CNI_AARCH64_GOPATH)/src/github.com/containernetworking
-        ln -sf $(@D) $(CNI_AARCH64_GOPATH)/src/github.com/containernetworking/cni
-endef
-
-define CNI_AARCH64_BUILD_CMDS
-	(cd $(@D); $(CNI_AARCH64_MAKE_ENV) go build -o bin/cnitool $(CNI_AARCH64_BUILDFLAGS) ./cnitool)
-endef
-
-define CNI_AARCH64_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/cnitool \
-		$(TARGET_DIR)/opt/cni/bin/cnitool
-
-	ln -sf \
-		../../opt/cni/bin/cnitool \
-		$(TARGET_DIR)/usr/bin/cnitool
-endef
-
-$(eval $(generic-package))

deploy/iso/minikube-iso/arch/x86_64/package/Config.in

@@ -4,7 +4,6 @@ menu "System tools x86_64"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/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"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/podman/Config.in"

deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.hash

@@ -1,6 +0,0 @@
-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

deploy/iso/minikube-iso/package/Config.in

@@ -2,6 +2,7 @@ menu "System tools"
     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/crun/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in"

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