From a6a3952884a019fba8f07d1329e2ea05327f23da Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 26 Apr 2022 13:10:38 -0700 Subject: [PATCH] fix runc again --- .../aarch64/package/runc-aarch64/Config.in | 4 +- .../arch/aarch64/package/runc-aarch64/runc.mk | 40 ++++++++-------- .../arch/x86_64/package/Config.in | 2 +- .../package/{runc => runc-head}/Config.in | 4 +- .../runc.hash => runc-head/runc-head.hash} | 0 .../x86_64/package/runc-head/runc-head.mk | 46 +++++++++++++++++++ .../arch/x86_64/package/runc/runc.mk | 46 ------------------- 7 files changed, 71 insertions(+), 71 deletions(-) rename deploy/iso/minikube-iso/arch/x86_64/package/{runc => runc-head}/Config.in (92%) rename deploy/iso/minikube-iso/arch/x86_64/package/{runc/runc.hash => runc-head/runc-head.hash} (100%) create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/runc-head/runc-head.mk delete 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/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/Config.in index fd77cee906..c473865fc8 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/Config.in +++ b/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_RUNC - bool "runc" +config BR2_PACKAGE_RUNC_HEAD + bool "runc-head" depends on BR2_aarch64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS 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 index 99371fe90f..61ec63749c 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc.mk @@ -5,41 +5,41 @@ ################################################################################ # 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_HEAD_VERSION = f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe +RUNC_HEAD_SITE = https://github.com/opencontainers/runc/archive +RUNC_HEAD_SOURCE = $(RUNC_HEAD_VERSION).tar.gz +RUNC_HEAD_LICENSE = Apache-2.0 +RUNC_HEAD_LICENSE_FILES = LICENSE -RUNC_DEPENDENCIES = host-go +RUNC_HEAD_DEPENDENCIES = host-go -RUNC_GOPATH = $(@D)/_output -RUNC_MAKE_ENV = \ +RUNC_HEAD_GOPATH = $(@D)/_output +RUNC_HEAD_MAKE_ENV = \ $(GO_TARGET_ENV) \ CGO_ENABLED=1 \ GO111MODULE=off \ - GOPATH="$(RUNC_GOPATH)" \ - GOBIN="$(RUNC_GOPATH)/bin" \ - PATH=$(RUNC_GOPATH)/bin:$(BR_PATH) \ + GOPATH="$(RUNC_HEAD_GOPATH)" \ + GOBIN="$(RUNC_HEAD_GOPATH)/bin" \ + PATH=$(RUNC_HEAD_GOPATH)/bin:$(BR_PATH) \ GOARCH=arm64 -RUNC_COMPILE_SRC = $(RUNC_GOPATH)/src/github.com/opencontainers/runc +RUNC_HEAD_COMPILE_SRC = $(RUNC_HEAD_GOPATH)/src/github.com/opencontainers/runc ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -RUNC_GOTAGS += seccomp -RUNC_DEPENDENCIES += libseccomp host-pkgconf +RUNC_HEAD_GOTAGS += seccomp +RUNC_HEAD_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 +define RUNC_HEAD_CONFIGURE_CMDS + mkdir -p $(RUNC_HEAD_GOPATH)/src/github.com/opencontainers + ln -s $(@D) $(RUNC_HEAD_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 +define RUNC_HEAD_BUILD_CMDS + PWD=$(RUNC_HEAD_COMPILE_SRC) $(RUNC_HEAD_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) BUILDTAGS="$(RUNC_HEAD_GOTAGS)" COMMIT_NO=$(RUNC_HEAD_VERSION) COMMIT=$(RUNC_HEAD_VERSION) PREFIX=/usr endef -define RUNC_INSTALL_TARGET_CMDS +define RUNC_HEAD_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/runc $(TARGET_DIR)/usr/bin/runc endef 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 fa86edd92d..b403c7d01b 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,5 @@ menu "System tools" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/runc/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/runc-head/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crio-bin/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-x86_64/Config.in" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/runc/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/runc-head/Config.in similarity index 92% rename from deploy/iso/minikube-iso/arch/x86_64/package/runc/Config.in rename to deploy/iso/minikube-iso/arch/x86_64/package/runc-head/Config.in index 0106b2eeaf..057e9af6ad 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/runc/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/runc-head/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_RUNC - bool "runc" +config BR2_PACKAGE_RUNC_HEAD + bool "runc-head" depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.hash b/deploy/iso/minikube-iso/arch/x86_64/package/runc-head/runc-head.hash similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.hash rename to deploy/iso/minikube-iso/arch/x86_64/package/runc-head/runc-head.hash diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/runc-head/runc-head.mk b/deploy/iso/minikube-iso/arch/x86_64/package/runc-head/runc-head.mk new file mode 100644 index 0000000000..0a9a9ff341 --- /dev/null +++ b/deploy/iso/minikube-iso/arch/x86_64/package/runc-head/runc-head.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# runc +# +################################################################################ + +# As of 2021-12-03, v1.0.3 +RUNC_HEAD_VERSION = f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe +RUNC_HEAD_SITE = https://github.com/opencontainers/runc/archive +RUNC_HEAD_SOURCE = $(RUNC_HEAD_VERSION).tar.gz +RUNC_HEAD_LICENSE = Apache-2.0 +RUNC_HEAD_LICENSE_FILES = LICENSE + +RUNC_HEAD_DEPENDENCIES = host-go + +RUNC_HEAD_GOPATH = $(@D)/_output +RUNC_HEAD_MAKE_ENV = \ + $(GO_TARGET_ENV) \ + CGO_ENABLED=1 \ + GO111MODULE=off \ + GOPATH="$(RUNC_HEAD_GOPATH)" \ + GOBIN="$(RUNC_HEAD_GOPATH)/bin" \ + PATH=$(RUNC_HEAD_GOPATH)/bin:$(BR_PATH) \ + GOARCH=amd64 + +RUNC_HEAD_COMPILE_SRC = $(RUNC_HEAD_GOPATH)/src/github.com/opencontainers/runc + +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +RUNC_HEAD_GOTAGS += seccomp +RUNC_HEAD_DEPENDENCIES += libseccomp host-pkgconf +endif + +define RUNC_HEAD_CONFIGURE_CMDS + mkdir -p $(RUNC_HEAD_GOPATH)/src/github.com/opencontainers + ln -s $(@D) $(RUNC_HEAD_GOPATH)/src/github.com/opencontainers/runc +endef + +define RUNC_HEAD_BUILD_CMDS + PWD=$(RUNC_HEAD_COMPILE_SRC) $(RUNC_HEAD_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) BUILDTAGS="$(RUNC_HEAD_GOTAGS)" COMMIT_NO=$(RUNC_HEAD_VERSION) COMMIT=$(RUNC_HEAD_VERSION) PREFIX=/usr +endef + +define RUNC_HEAD_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.mk b/deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.mk deleted file mode 100644 index 97856a381f..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# 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))