From a1be91347651a502a28d469270d0e6ea5b22ece0 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 2 Jun 2022 17:44:44 -0700 Subject: [PATCH] fix aarch mk file --- .../package/cri-dockerd-aarch64/Config.in | 2 +- .../cri-dockerd-aarch64/cri-dockerd.mk | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) 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 index 5a4ecc3a14..ee257ae4f7 100644 --- 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 @@ -1,4 +1,4 @@ -config BR2_PACKAGE_CRI_DOCKERD +config BR2_PACKAGE_CRI_DOCKERD_AARCH64 bool "cri-dockerd" default y depends on BR2_aarch64 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 index 28c1076261..05816af10d 100644 --- 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 @@ -5,36 +5,36 @@ ################################################################################ # 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_AARCH64_VER = 0.2.0 +CRI_DOCKERD_AARCH64_REV = a4d1895 +CRI_DOCKERD_AARCH64_VERSION = a4d1895a2659ea9974bd7528a706592ab8b74181 +CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive +CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz -CRI_DOCKERD_DEPENDENCIES = host-go -CRI_DOCKERD_GOPATH = $(@D)/_output -CRI_DOCKERD_ENV = \ +CRI_DOCKERD_AARCH64_DEPENDENCIES = host-go +CRI_DOCKERD_AARCH64_GOPATH = $(@D)/_output +CRI_DOCKERD_AARCH64_ENV = \ $(GO_TARGET_ENV) \ CGO_ENABLED=0 \ GO111MODULE=on \ - GOPATH="$(CRI_DOCKERD_GOPATH)" \ - PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \ + GOPATH="$(CRI_DOCKERD_AARCH64_GOPATH)" \ + PATH=$(CRI_DOCKERD_AARCH64_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)'" +CRI_DOCKERD_AARCH64_COMPILE_SRC = $(CRI_DOCKERD_AARCH64_GOPATH)/src/github.com/Mirantis/cri-dockerd +CRI_DOCKERD_AARCH64_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_AARCH64_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_AARCH64_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 +define CRI_DOCKERD_AARCH64_BUILD_CMDS + $(CRI_DOCKERD_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_AARCH64_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_AARCH64_VER) REVISION=$(CRI_DOCKERD_AARCH64_REV) static endef -define CRI_DOCKERD_INSTALL_TARGET_CMDS +define CRI_DOCKERD_AARCH64_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 +define CRI_DOCKERD_AARCH64_INSTALL_INIT_SYSTEMD $(INSTALL) -Dm644 \ $(@D)/packaging/systemd/cri-docker.service \ $(TARGET_DIR)/usr/lib/systemd/system/cri-docker.service