kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix runc again

pull/13762/head
Sharif Elgamal 2022-04-26 13:10:38 -07:00
parent b1e280eb8d
commit a6a3952884
7 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/Config.in
View File

@ -1,5 +1,5 @@
config BR2_PACKAGE_RUNC config BR2_PACKAGE_RUNC_HEAD
bool "runc" bool "runc-head"
depends on BR2_aarch64 depends on BR2_aarch64
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS

40
deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc.mk
View File

@ -5,41 +5,41 @@
################################################################################ ################################################################################
# As of 2021-12-03, v1.0.3 # As of 2021-12-03, v1.0.3
RUNC_VERSION = f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe RUNC_HEAD_VERSION = f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe
RUNC_SITE = https://github.com/opencontainers/runc/archive RUNC_HEAD_SITE = https://github.com/opencontainers/runc/archive
RUNC_SOURCE = $(RUNC_VERSION).tar.gz RUNC_HEAD_SOURCE = $(RUNC_HEAD_VERSION).tar.gz
RUNC_LICENSE = Apache-2.0 RUNC_HEAD_LICENSE = Apache-2.0
RUNC_LICENSE_FILES = LICENSE RUNC_HEAD_LICENSE_FILES = LICENSE
RUNC_DEPENDENCIES = host-go RUNC_HEAD_DEPENDENCIES = host-go
RUNC_GOPATH = $(@D)/_output RUNC_HEAD_GOPATH = $(@D)/_output
RUNC_MAKE_ENV = \ RUNC_HEAD_MAKE_ENV = \
$(GO_TARGET_ENV) \ $(GO_TARGET_ENV) \
CGO_ENABLED=1 \ CGO_ENABLED=1 \
GO111MODULE=off \ GO111MODULE=off \
GOPATH="$(RUNC_GOPATH)" \ GOPATH="$(RUNC_HEAD_GOPATH)" \
GOBIN="$(RUNC_GOPATH)/bin" \ GOBIN="$(RUNC_HEAD_GOPATH)/bin" \
PATH=$(RUNC_GOPATH)/bin:$(BR_PATH) \ PATH=$(RUNC_HEAD_GOPATH)/bin:$(BR_PATH) \
GOARCH=arm64 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) ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
RUNC_GOTAGS += seccomp RUNC_HEAD_GOTAGS += seccomp
RUNC_DEPENDENCIES += libseccomp host-pkgconf RUNC_HEAD_DEPENDENCIES += libseccomp host-pkgconf
endif endif
define RUNC_CONFIGURE_CMDS define RUNC_HEAD_CONFIGURE_CMDS
mkdir -p $(RUNC_GOPATH)/src/github.com/opencontainers mkdir -p $(RUNC_HEAD_GOPATH)/src/github.com/opencontainers
ln -s $(@D) $(RUNC_GOPATH)/src/github.com/opencontainers/runc ln -s $(@D) $(RUNC_HEAD_GOPATH)/src/github.com/opencontainers/runc
endef endef
define RUNC_BUILD_CMDS define RUNC_HEAD_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 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 endef
define RUNC_INSTALL_TARGET_CMDS define RUNC_HEAD_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/runc $(TARGET_DIR)/usr/bin/runc $(INSTALL) -D -m 0755 $(@D)/runc $(TARGET_DIR)/usr/bin/runc
endef endef

2
deploy/iso/minikube-iso/arch/x86_64/package/Config.in
View File

@ -1,5 +1,5 @@
menu "System tools" 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/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/crictl-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin-x86_64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin-x86_64/Config.in"

4
deploy/iso/minikube-iso/arch/x86_64/package/runc/Config.in → deploy/iso/minikube-iso/arch/x86_64/package/runc-head/Config.in
View File

@ -1,5 +1,5 @@
config BR2_PACKAGE_RUNC config BR2_PACKAGE_RUNC_HEAD
bool "runc" bool "runc-head"
depends on BR2_x86_64 depends on BR2_x86_64
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS

0
deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.hash → deploy/iso/minikube-iso/arch/x86_64/package/runc-head/runc-head.hash
View File

46
deploy/iso/minikube-iso/arch/x86_64/package/runc-head/runc-head.mk Normal file
View File

@ -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))

46
deploy/iso/minikube-iso/arch/x86_64/package/runc/runc.mk
View File

@ -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))