try using arch directory

pull/13762/head
Sharif Elgamal 2022-04-26 11:50:08 -07:00
parent 15c9e2a161
commit 052cec1932
57 changed files with 82 additions and 13 deletions

View File

@ -1 +1,3 @@
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/Config.in"

View File

@ -0,0 +1,9 @@
menu "System tools"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crio-bin-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in"
endmenu

View File

@ -20,7 +20,8 @@ CRI_DOCKERD_ENV = \
GO111MODULE=on \
GOPATH="$(CRI_DOCKERD_GOPATH)" \
GOBIN="$(CRI_DOCKERD_GOPATH)/bin" \
PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH)
PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \
GOARCH=arm64
CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd
CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'"

View File

@ -0,0 +1,9 @@
menu "System tools"
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"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in"
endmenu

View File

@ -0,0 +1,7 @@
config BR2_PACKAGE_CRI_DOCKERD
bool "cri-dockerd"
default y
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_DOCKER_BIN

View File

@ -0,0 +1,3 @@
sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz
sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz
sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz

View File

@ -0,0 +1,48 @@
################################################################################
#
# cri-dockerd
#
################################################################################
# As of 2022-02-03
CRI_DOCKERD_VER = 0.2.0
CRI_DOCKERD_REV = a4d1895
CRI_DOCKERD_VERSION = a4d1895a2659ea9974bd7528a706592ab8b74181
CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive
CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz
CRI_DOCKERD_DEPENDENCIES = host-go
CRI_DOCKERD_GOPATH = $(@D)/_output
CRI_DOCKERD_ENV = \
$(GO_TARGET_ENV) \
CGO_ENABLED=0 \
GO111MODULE=on \
GOPATH="$(CRI_DOCKERD_GOPATH)" \
GOBIN="$(CRI_DOCKERD_GOPATH)/bin" \
PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \
GOARCH=amd64
CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd
CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'"
define CRI_DOCKERD_BUILD_CMDS
$(CRI_DOCKERD_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_VER) REVISION=$(CRI_DOCKERD_REV) static-linux
endef
define CRI_DOCKERD_INSTALL_TARGET_CMDS
$(INSTALL) -Dm755 \
$(@D)/packaging/static/build/linux/cri-dockerd/cri-dockerd \
$(TARGET_DIR)/usr/bin/cri-dockerd
endef
define CRI_DOCKERD_INSTALL_INIT_SYSTEMD
$(INSTALL) -Dm644 \
$(@D)/packaging/systemd/cri-docker.service \
$(TARGET_DIR)/usr/lib/systemd/system/cri-docker.service
$(INSTALL) -Dm644 \
$(@D)/packaging/systemd/cri-docker.socket \
$(TARGET_DIR)/usr/lib/systemd/system/cri-docker.socket
endef
$(eval $(generic-package))

View File

@ -1 +1,3 @@
include $(sort $(wildcard $(BR2_EXTERNAL_MINIKUBE_PATH)/package/*/*.mk))
include $(sort $(wildcard $(BR2_EXTERNAL_MINIKUBE_PATH)/arch/x86_64/package/*/*.mk))
include $(sort $(wildcard $(BR2_EXTERNAL_MINIKUBE_PATH)/arch/aarch64/package/*/*.mk))

View File

@ -3,22 +3,10 @@ menu "System tools"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crictl-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crictl-bin-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/docker-bin-x86_64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/docker-bin-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cri-dockerd/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-plugins/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-plugins-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hyperv-daemons/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/vbox-guest/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/containerd-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/containerd-bin-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/buildkit-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/scheduled-stop/Config.in"