Moved build steps into build() and made the intent of prepare() more obvious (by not using git to do it)

2 files changed, 11 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffd85bc37087..0d12b9886d0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = minikube-git
 	pkgdesc = Minikube is a tool that makes it easy to run Kubernetes locally.
-	pkgver = v0.25.0.r95.g6bf2661ca
+	pkgver = v0.25.0.r96.ga000c35e1
 	pkgrel = 1
 	url = https://github.com/kubernetes/minikube
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 514be0d080ba..bb0ae6c1db2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Upstream: https://github.com/kubernetes/minikube
 
 pkgname=('minikube-git')
-pkgver=v0.25.0.r95.g6bf2661ca
+pkgver=v0.25.0.r96.ga000c35e1
 pkgrel=1
 pkgdesc='Minikube is a tool that makes it easy to run Kubernetes locally.'
 arch=('x86_64')
@@ -27,15 +27,19 @@ pkgver() {
 }
 
 prepare() {
-    export GOPATH="$srcdir"
     rm -rf "$srcdir/src"
-    git clone "$srcdir/$pkgname" "$GOPATH/src/k8s.io/minikube"
+    mkdir -p "$srcdir/src/k8s.io"
+    cp -r "$srcdir/$pkgname" "$srcdir/src/k8s.io"
+    mv "$srcdir/src/k8s.io/$pkgname" "$srcdir/src/k8s.io/minikube"
 }
 
-package() {
+build() {
     export GOPATH="$srcdir"
     cd "$GOPATH/src/k8s.io/minikube"
     make
-    install -Dm755 "out/minikube" "$pkgdir/usr/bin/minikube"
-    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package() {
+    install -Dm755 "$srcdir/src/k8s.io/minikube/out/minikube" "$pkgdir/usr/bin/minikube"
+    install -Dm644 "$srcdir/src/k8s.io/minikube/LICENSE" "$pkgdir/usr/share/licenses/minikube/LICENSE"
 }