fixup again

Author: rv32ima

deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk

@@ -38,12 +38,12 @@ CRI_DOCKERD_AARCH64_POST_EXTRACT_HOOKS += CRI_DOCKERD_AARCH64_POST_EXTRACT_WORKA
 # If https://github.com/Mirantis/cri-dockerd/blob/master/packaging/Makefile changes, then this will almost certainly need to change
 # This uses the static make target at the top level Makefile, since that builds everything, then picks out the arm64 binary
 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
+	$(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-linux
 endef
 
 define CRI_DOCKERD_AARCH64_INSTALL_TARGET_CMDS
 	$(INSTALL) -Dm755 \
-		$(@D)/packaging/static/build/arm/cri-dockerd/cri-dockerd \
+		$(@D)/packaging/static/build/linux/cri-dockerd/cri-dockerd \
 		$(TARGET_DIR)/usr/bin/cri-dockerd
 endef
 

deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk

@@ -3,16 +3,16 @@
 # containerd
 #
 ################################################################################
-CONTAINERD_BIN_AARCH64_VERSION = v2.1.3
-CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/releases/download/$(CONTAINERD_BIN_AARCH64_VERSION)
-CONTAINERD_BIN_AARCH64_SOURCE = containerd-$(CONTAINERD_BIN_AARCH64_VERSION:v%=%)-linux-amd64.tar.gz
+CONTAINERD_BIN_VERSION = v2.1.3
+CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/releases/download/$(CONTAINERD_BIN_AARCH64_VERSION)
+CONTAINERD_BIN_SOURCE = containerd-$(CONTAINERD_BIN_VERSION:v%=%)-linux-amd64.tar.gz
 
-define CONTAINERD_BIN_AARCH64_USERS
+define CONTAINERD_BIN_USERS
 	- -1 containerd-admin -1 - - - - -
 	- -1 containerd       -1 - - - - -
 endef
 
-define CONTAINERD_BIN_AARCH64_INSTALL_TARGET_CMDS
+define CONTAINERD_BIN_INSTALL_TARGET_CMDS
 	$(INSTALL) -Dm755 \
 		$(@D)/containerd \
 		$(TARGET_DIR)/bin
@@ -23,19 +23,19 @@ define CONTAINERD_BIN_AARCH64_INSTALL_TARGET_CMDS
 		$(@D)/ctr \
 		$(TARGET_DIR)/usr/bin
 	$(INSTALL) -Dm644 \
-		$(CONTAINERD_BIN_AARCH64_PKGDIR)/config.toml \
+		$(CONTAINERD_BIN_PKGDIR)/config.toml \
 		$(TARGET_DIR)/etc/containerd/config.toml
 	$(INSTALL) -Dm644 \
-		$(CONTAINERD_BIN_AARCH64_PKGDIR)/containerd_docker_io_hosts.toml \
+		$(CONTAINERD_BIN_PKGDIR)/containerd_docker_io_hosts.toml \
 		$(TARGET_DIR)/etc/containerd/certs.d/docker.io/hosts.toml
 endef
 
-define CONTAINERD_BIN_AARCH64_INSTALL_INIT_SYSTEMD
+define CONTAINERD_BIN_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -Dm644 \
-		$(CONTAINERD_BIN_AARCH64_PKGDIR)/containerd.service \
+		$(CONTAINERD_BIN_PKGDIR)/containerd.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/containerd.service
 	$(INSTALL) -Dm644 \
-		$(CONTAINERD_BIN_AARCH64_PKGDIR)/50-minikube.preset \
+		$(CONTAINERD_BIN_PKGDIR)/50-minikube.preset \
 		$(TARGET_DIR)/usr/lib/systemd/system-preset/50-minikube.preset
 endef