From b1e280eb8dc01f93581a6b88adc3bdc0d0b83a22 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 26 Apr 2022 13:01:51 -0700 Subject: [PATCH] fix runc --- .../package/runc-aarch64/runc-master.mk | 45 ------------------ .../{runc-master.hash => runc.hash} | 0 .../arch/aarch64/package/runc-aarch64/runc.mk | 46 +++++++++++++++++++ .../arch/x86_64/package/runc/runc-master.mk | 45 ------------------ .../runc/{runc-master.hash => runc.hash} | 0 .../arch/x86_64/package/runc/runc.mk | 46 +++++++++++++++++++ 6 files changed, 92 insertions(+), 90 deletions(-) delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc-master.mk rename deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/{runc-master.hash => runc.hash} (100%) create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc.mk delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/runc/runc-master.mk rename deploy/iso/minikube-iso/arch/x86_64/package/runc/{runc-master.hash => runc.hash} (100%) create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.mk diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc-master.mk b/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc-master.mk deleted file mode 100644 index 9f52e8c8e9..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc-master.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# runc -# -################################################################################ - -# As of 2021-12-03, v1.0.3 -RUNC_MASTER_VERSION = f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe -RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive -RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz -RUNC_MASTER_LICENSE = Apache-2.0 -RUNC_MASTER_LICENSE_FILES = LICENSE - -RUNC_MASTER_DEPENDENCIES = host-go - -RUNC_MASTER_GOPATH = $(@D)/_output -RUNC_MASTER_MAKE_ENV = \ - $(GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - GO111MODULE=off \ - GOPATH="$(RUNC_MASTER_GOPATH)" \ - GOBIN="$(RUNC_MASTER_GOPATH)/bin" \ - PATH=$(RUNC_MASTER_GOPATH)/bin:$(BR_PATH) - -RUNC_MASTER_COMPILE_SRC = $(RUNC_MASTER_GOPATH)/src/github.com/opencontainers/runc - -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -RUNC_MASTER_GOTAGS += seccomp -RUNC_MASTER_DEPENDENCIES += libseccomp host-pkgconf -endif - -define RUNC_MASTER_CONFIGURE_CMDS - mkdir -p $(RUNC_MASTER_GOPATH)/src/github.com/opencontainers - ln -s $(@D) $(RUNC_MASTER_GOPATH)/src/github.com/opencontainers/runc -endef - -define RUNC_MASTER_BUILD_CMDS - PWD=$(RUNC_MASTER_COMPILE_SRC) $(RUNC_MASTER_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) BUILDTAGS="$(RUNC_MASTER_GOTAGS)" COMMIT_NO=$(RUNC_MASTER_VERSION) COMMIT=$(RUNC_MASTER_VERSION) PREFIX=/usr -endef - -define RUNC_MASTER_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/runc $(TARGET_DIR)/usr/bin/runc -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc-master.hash b/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc.hash similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc-master.hash rename to deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc.hash diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc.mk b/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc.mk new file mode 100644 index 0000000000..99371fe90f --- /dev/null +++ b/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# runc +# +################################################################################ + +# As of 2021-12-03, v1.0.3 +RUNC_VERSION = f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe +RUNC_SITE = https://github.com/opencontainers/runc/archive +RUNC_SOURCE = $(RUNC_VERSION).tar.gz +RUNC_LICENSE = Apache-2.0 +RUNC_LICENSE_FILES = LICENSE + +RUNC_DEPENDENCIES = host-go + +RUNC_GOPATH = $(@D)/_output +RUNC_MAKE_ENV = \ + $(GO_TARGET_ENV) \ + CGO_ENABLED=1 \ + GO111MODULE=off \ + GOPATH="$(RUNC_GOPATH)" \ + GOBIN="$(RUNC_GOPATH)/bin" \ + PATH=$(RUNC_GOPATH)/bin:$(BR_PATH) \ + GOARCH=arm64 + +RUNC_COMPILE_SRC = $(RUNC_GOPATH)/src/github.com/opencontainers/runc + +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +RUNC_GOTAGS += seccomp +RUNC_DEPENDENCIES += libseccomp host-pkgconf +endif + +define RUNC_CONFIGURE_CMDS + mkdir -p $(RUNC_GOPATH)/src/github.com/opencontainers + ln -s $(@D) $(RUNC_GOPATH)/src/github.com/opencontainers/runc +endef + +define RUNC_BUILD_CMDS + PWD=$(RUNC_COMPILE_SRC) $(RUNC_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) BUILDTAGS="$(RUNC_GOTAGS)" COMMIT_NO=$(RUNC_VERSION) COMMIT=$(RUNC_VERSION) PREFIX=/usr +endef + +define RUNC_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/runc $(TARGET_DIR)/usr/bin/runc +endef + +$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/runc/runc-master.mk b/deploy/iso/minikube-iso/arch/x86_64/package/runc/runc-master.mk deleted file mode 100644 index 9f52e8c8e9..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/runc/runc-master.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# runc -# -################################################################################ - -# As of 2021-12-03, v1.0.3 -RUNC_MASTER_VERSION = f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe -RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive -RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz -RUNC_MASTER_LICENSE = Apache-2.0 -RUNC_MASTER_LICENSE_FILES = LICENSE - -RUNC_MASTER_DEPENDENCIES = host-go - -RUNC_MASTER_GOPATH = $(@D)/_output -RUNC_MASTER_MAKE_ENV = \ - $(GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - GO111MODULE=off \ - GOPATH="$(RUNC_MASTER_GOPATH)" \ - GOBIN="$(RUNC_MASTER_GOPATH)/bin" \ - PATH=$(RUNC_MASTER_GOPATH)/bin:$(BR_PATH) - -RUNC_MASTER_COMPILE_SRC = $(RUNC_MASTER_GOPATH)/src/github.com/opencontainers/runc - -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -RUNC_MASTER_GOTAGS += seccomp -RUNC_MASTER_DEPENDENCIES += libseccomp host-pkgconf -endif - -define RUNC_MASTER_CONFIGURE_CMDS - mkdir -p $(RUNC_MASTER_GOPATH)/src/github.com/opencontainers - ln -s $(@D) $(RUNC_MASTER_GOPATH)/src/github.com/opencontainers/runc -endef - -define RUNC_MASTER_BUILD_CMDS - PWD=$(RUNC_MASTER_COMPILE_SRC) $(RUNC_MASTER_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) BUILDTAGS="$(RUNC_MASTER_GOTAGS)" COMMIT_NO=$(RUNC_MASTER_VERSION) COMMIT=$(RUNC_MASTER_VERSION) PREFIX=/usr -endef - -define RUNC_MASTER_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/runc $(TARGET_DIR)/usr/bin/runc -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/runc/runc-master.hash b/deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.hash similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/runc/runc-master.hash rename to deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.hash diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.mk b/deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.mk new file mode 100644 index 0000000000..97856a381f --- /dev/null +++ b/deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# runc +# +################################################################################ + +# As of 2021-12-03, v1.0.3 +RUNC_VERSION = f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe +RUNC_SITE = https://github.com/opencontainers/runc/archive +RUNC_SOURCE = $(RUNC_VERSION).tar.gz +RUNC_LICENSE = Apache-2.0 +RUNC_LICENSE_FILES = LICENSE + +RUNC_DEPENDENCIES = host-go + +RUNC_GOPATH = $(@D)/_output +RUNC_MAKE_ENV = \ + $(GO_TARGET_ENV) \ + CGO_ENABLED=1 \ + GO111MODULE=off \ + GOPATH="$(RUNC_GOPATH)" \ + GOBIN="$(RUNC_GOPATH)/bin" \ + PATH=$(RUNC_GOPATH)/bin:$(BR_PATH) \ + GOARCH=amd64 + +RUNC_COMPILE_SRC = $(RUNC_GOPATH)/src/github.com/opencontainers/runc + +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +RUNC_GOTAGS += seccomp +RUNC_DEPENDENCIES += libseccomp host-pkgconf +endif + +define RUNC_CONFIGURE_CMDS + mkdir -p $(RUNC_GOPATH)/src/github.com/opencontainers + ln -s $(@D) $(RUNC_GOPATH)/src/github.com/opencontainers/runc +endef + +define RUNC_BUILD_CMDS + PWD=$(RUNC_COMPILE_SRC) $(RUNC_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) BUILDTAGS="$(RUNC_GOTAGS)" COMMIT_NO=$(RUNC_VERSION) COMMIT=$(RUNC_VERSION) PREFIX=/usr +endef + +define RUNC_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/runc $(TARGET_DIR)/usr/bin/runc +endef + +$(eval $(generic-package))