From afb9f7fb5c7d6493deaea4b64c2417035044dc6d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 4 Mar 2021 09:38:45 +0100 Subject: [PATCH] minikube: update to 1.18.0. fix crossbuild (fails due to kubernetes), remove git clone. --- srcpkgs/minikube/template | 41 ++++++++++++++------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template index 7103acd25f62b1..a091708aa97950 100644 --- a/srcpkgs/minikube/template +++ b/srcpkgs/minikube/template @@ -1,12 +1,11 @@ # Template file for 'minikube' pkgname=minikube -version=1.13.0 +version=1.18.0 revision=1 -archs="x86_64* ppc64le*" -build_wrksrc=src/k8s.io/minikube build_style=go -go_import_path=k8s.io/minikube -hostmakedepends="git go-bindata python pkg-config" +build_helper=qemu +go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm" +hostmakedepends="go-bindata python pkg-config git" makedepends="libvirt-devel" depends="kubectl" short_desc="Tool to make it easy to run Kubernetes locally" @@ -14,15 +13,8 @@ maintainer="Daniel Santana " license="Apache-2.0" homepage="https://github.com/kubernetes/minikube" changelog="https://raw.githubusercontent.com/kubernetes/minikube/master/CHANGELOG.md" - -do_fetch() { - # We must clone it instead of downloading the tarball because the build - # process expects the directory to be a git repository - rm -rf $wrksrc - mkdir -p $wrksrc/src/k8s.io - git clone -b v${version} https://github.com/kubernetes/minikube \ - $wrksrc/src/k8s.io/minikube -} +distfiles="https://github.com/kubernetes/minikube/archive/v$version.tar.gz" +checksum="c3f0f60607bca0c2f1a118d6d5ce313ac0c6e56b5f9621cb00ca17271aceaff6" pre_configure() { case "$XBPS_TARGET_MACHINE" in @@ -30,21 +22,18 @@ pre_configure() { esac } -do_build() { - export GOPATH="$wrksrc" - - make - make out/docker-machine-driver-kvm2 - - out/minikube completion bash > completion.bash - out/minikube completion zsh | sed -n '/#compdef/,$p' > completion.zsh +pre_build() { + make pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go } do_install() { - vbin out/minikube - vbin out/docker-machine-driver-kvm2 - vinstall completion.bash 644 usr/share/bash-completion/completions minikube - vinstall completion.zsh 644 usr/share/zsh/site-functions _minikube + vbin $GOPATH/bin/minikube + vbin $GOPATH/bin/kvm docker-machine-driver-kvm2 + + for shell in bash zsh fish; do + vtargetrun $GOPATH/bin/minikube completion $shell > completion.$shell + vcompletion completion.$shell $shell + done } docker-machine-driver-kvm2_package() {