From c376927e704099e57a2f6caa74192ade32409b6e Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 28 Jun 2023 13:39:47 -0700 Subject: [PATCH] set strip components to 0 --- .../arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk | 5 +++-- .../arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk index 68c85813c6..d2b10e53c9 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk @@ -8,11 +8,12 @@ NERDCTL_BIN_AARCH64_VERSION = 1.4.0 NERDCTL_BIN_AARCH64_COMMIT = 7e8114a82da342cdbec9a518c5c6a1cce58105e9 NERDCTL_BIN_AARCH64_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_AARCH64_VERSION) NERDCTL_BIN_AARCH64_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz +NERDCTL_BIN_AARCH64_STRIP_COMPONENTS = 0 define NERDCTL_BIN_AARCH64_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 \ - $(NERDCTL_BIN_AARCH64_PKGDIR)/nerdctl \ - $(TARGET_DIR)/usr/bin + $(@D)/nerdctl \ + $(TARGET_DIR)/usr/bin/nerdctl endef $(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk index 12bb6126cc..e39f0d0444 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk @@ -8,11 +8,12 @@ NERDCTL_BIN_VERSION = 1.4.0 NERDCTL_BIN_COMMIT = 7e8114a82da342cdbec9a518c5c6a1cce58105e9 NERDCTL_BIN_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_VERSION) NERDCTL_BIN_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-amd64.tar.gz +NERDCTL_BIN_STRIP_COMPONENTS = 0 define NERDCTL_BIN_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 \ - $(NERDCTL_BIN_PKGDIR)/nerdctl \ - $(TARGET_DIR)/usr/bin + $(@D)/nerdctl \ + $(TARGET_DIR)/usr/bin/nerdctl endef $(eval $(generic-package))