From 7ef37124d5a1aeb38899245e1281ec1b28c7952b Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 2 Jun 2022 17:41:15 -0700 Subject: [PATCH] revert cri-dockerd to old way, they're slightly different --- .../arch/aarch64/package/Config.in | 1 + .../package/cri-dockerd-aarch64/Config.in | 8 ++++ .../cri-dockerd-aarch64}/cri-dockerd.hash | 0 .../cri-dockerd-aarch64/cri-dockerd.mk | 46 +++++++++++++++++++ .../arch/x86_64/package/Config.in | 1 + .../x86_64}/package/cri-dockerd/Config.in | 1 + .../package/cri-dockerd/cri-dockerd.hash | 3 ++ .../package/cri-dockerd/cri-dockerd.mk | 8 +--- deploy/iso/minikube-iso/package/Config.in | 1 - 9 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in rename deploy/iso/minikube-iso/{package/cri-dockerd => arch/aarch64/package/cri-dockerd-aarch64}/cri-dockerd.hash (100%) create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/cri-dockerd/Config.in (91%) create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/cri-dockerd/cri-dockerd.mk (93%) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in index 7d82e4feea..893f76c20e 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in @@ -1,5 +1,6 @@ menu "System tools aarch64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/buildkit-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/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/cni-plugins-aarch64/Config.in" diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in new file mode 100644 index 0000000000..5a4ecc3a14 --- /dev/null +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_CRI_DOCKERD + bool "cri-dockerd" + default y + depends on BR2_aarch64 + 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/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/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk new file mode 100644 index 0000000000..28c1076261 --- /dev/null +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# 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)" \ + 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)'" + +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 +endef + +define CRI_DOCKERD_INSTALL_TARGET_CMDS + $(INSTALL) -Dm755 \ + $(@D)/packaging/static/build/arm/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/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index ceea86d249..ac1b922baf 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -1,5 +1,6 @@ menu "System tools x86_64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/buildkit-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/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/cni-plugins/Config.in" diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in similarity index 91% rename from deploy/iso/minikube-iso/package/cri-dockerd/Config.in rename to deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in index 57d2e21825..460971d045 100644 --- a/deploy/iso/minikube-iso/package/cri-dockerd/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CRI_DOCKERD bool "cri-dockerd" 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/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/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk similarity index 93% rename from deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk rename to deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk index a9e20ced72..501fc49fbe 100644 --- a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk @@ -12,12 +12,6 @@ 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_GOARCH=arm64 -ifeq ($(BR2_x86_64),y) -CRI_DOCKERD_GOARCH=amd64 -endif - CRI_DOCKERD_GOPATH = $(@D)/_output CRI_DOCKERD_ENV = \ $(GO_TARGET_ENV) \ @@ -25,7 +19,7 @@ CRI_DOCKERD_ENV = \ GO111MODULE=on \ GOPATH="$(CRI_DOCKERD_GOPATH)" \ PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \ - GOARCH=$(CRI_DOCKERD_GOARCH) + 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)'" diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 317f31c94d..95dd099b86 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -3,7 +3,6 @@ menu "System tools" 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/cri-dockerd/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"