Updated recipes to support new build system and project structure.

1 files changed, 19 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a7fb55ee383f..54c6f4984974 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,47 @@
 # Maintainer: Paul Knopf <pauldotknopf@gmail.com>
 pkgname=darch-alpha-git
 pkgrel=1
-pkgver=1.0.0.10a50c38ee2064bdc96f101cb6cb02169ecb2bf1
+pkgver=05557ee31a34414087a0e38db389e15118e462b4
 epoch=
-pkgdesc="A utility to that uses Docker to build stateless Arch images that can be booted bare-metal."
+pkgdesc="A utility to that uses containerd to build stateless operating system images that can be booted bare-metal."
 arch=('x86_64')
-url="https://github.com/pauldotknopf/darch"
+url="https://github.com/godarch/darch"
 license=('MIT')
 groups=()
-depends=('docker')
-makedepends=('jq go')
+depends=('libseccomp')
+makedepends=('go')
 checkdepends=()
 optdepends=()
-provides=()
-conflicts=()
+provides=('containerd', 'runc')
+conflicts=('containerd', 'runc', 'darch')
 replaces=()
 backup=()
 options=()
 install=
 changelog=
-source=("darch::git+https://github.com/pauldotknopf/darch.git#branch=develop")
+source=("git+https://github.com/godarch/darch.git#branch=develop")
 md5sums=('SKIP')
 noextract=()
 validpgpkeys=()
+_gourl=github.com/google/codesearch
 
 pkgver() {
-    rm "$srcdir/darch/gitversion"
-    cp "$startdir/gitversion" "$srcdir/darch/gitversion"
     local git_sha=`git --git-dir $srcdir/darch/.git rev-parse HEAD`
-    echo "1.0.0.$git_sha"
+    echo "$git_sha"
 }
 
 build() {
-    cd "$srcdir/darch"
-    make package
+    rm -rf "$srcdir/src/github.com/godarch"
+    mkdir -p "$srcdir/src/github.com/godarch"
+    mv "$srcdir/darch" "$srcdir/src/github.com/godarch"
+    export GOPATH="$srcdir"
+    export GOBIN="$srcdir/bin"
+    export PATH=$PATH:$GOBIN
+    cd "$srcdir/src/github.com/godarch/darch"
+    make ci BUNDLE_RUNTIME="yes"
 }
 
 package() {
     local arch=`go env GOARCH`
-    tar -xzpf "$srcdir/darch/bin/darch-$arch.tar.gz" -C "$pkgdir"
+    tar -xzpf "$srcdir/src/github.com/godarch/darch/output/darch-$arch-with-runtime.tar.gz" -C "$pkgdir"
 }