diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 337f336cc6..fafb3d388d 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -11,6 +11,7 @@ menu "System tools" 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/hyperv-daemons/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" diff --git a/deploy/iso/minikube-iso/package/cni-aarch64/Config.in b/deploy/iso/minikube-iso/package/cni-aarch64/Config.in new file mode 100644 index 0000000000..11cda9ee15 --- /dev/null +++ b/deploy/iso/minikube-iso/package/cni-aarch64/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_CNI + bool "cni" + default y + depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS diff --git a/deploy/iso/minikube-iso/package/cni-aarch64/cni.hash b/deploy/iso/minikube-iso/package/cni-aarch64/cni.hash new file mode 100644 index 0000000000..f8b1c8278f --- /dev/null +++ b/deploy/iso/minikube-iso/package/cni-aarch64/cni.hash @@ -0,0 +1,6 @@ +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/cni-aarch64/cni.mk b/deploy/iso/minikube-iso/package/cni-aarch64/cni.mk new file mode 100644 index 0000000000..6e3e7a6a99 --- /dev/null +++ b/deploy/iso/minikube-iso/package/cni-aarch64/cni.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# cni +# +################################################################################ + +CNI_VERSION = v0.7.1 +CNI_SITE = https://github.com/containernetworking/cni/archive +CNI_SOURCE = $(CNI_VERSION).tar.gz +CNI_LICENSE = Apache-2.0 +CNI_LICENSE_FILES = LICENSE + +CNI_DEPENDENCIES = host-go + +CNI_GOPATH = $(@D)/_output +CNI_MAKE_ENV = \ + $(GO_TARGET_ENV) \ + CGO_ENABLED=0 \ + GO111MODULE=off \ + GOPATH="$(CNI_GOPATH)" \ + GOBIN="$(CNI_GOPATH)/bin" \ + PATH=$(CNI_GOPATH)/bin:$(BR_PATH) + GOARCH=arm64 + +CNI_BUILDFLAGS = -a --ldflags '-extldflags \"-static\"' + +define CNI_CONFIGURE_CMDS + mkdir -p $(CNI_GOPATH)/src/github.com/containernetworking + ln -sf $(@D) $(CNI_GOPATH)/src/github.com/containernetworking/cni +endef + +define CNI_BUILD_CMDS + (cd $(@D); $(CNI_MAKE_ENV) go build -o bin/cnitool $(CNI_BUILDFLAGS) ./cnitool) +endef + +define CNI_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)) diff --git a/deploy/iso/minikube-iso/package/cni/Config.in b/deploy/iso/minikube-iso/package/cni/Config.in index dd6c4fcd39..b711219701 100644 --- a/deploy/iso/minikube-iso/package/cni/Config.in +++ b/deploy/iso/minikube-iso/package/cni/Config.in @@ -1,4 +1,5 @@ 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.mk b/deploy/iso/minikube-iso/package/cni/cni.mk index 396e966ed0..c83577239b 100644 --- a/deploy/iso/minikube-iso/package/cni/cni.mk +++ b/deploy/iso/minikube-iso/package/cni/cni.mk @@ -20,6 +20,7 @@ CNI_MAKE_ENV = \ GOPATH="$(CNI_GOPATH)" \ GOBIN="$(CNI_GOPATH)/bin" \ PATH=$(CNI_GOPATH)/bin:$(BR_PATH) + GOARCH=amd64 CNI_BUILDFLAGS = -a --ldflags '-extldflags \"-static\"'