Install dependencies with a prepare function and improve build.

2 files changed, 35 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 336eca5c0aa8..81a791c566e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Aug 24 07:55:42 UTC 2016
+# Fri Dec 30 00:26:00 UTC 2016
 pkgbase = containerd-git
 	pkgdesc = A daemon to control runC, built for performance and density
-	pkgver = v0.2.3.r2.g95d78ca
+	pkgver = v0.2.3.r201.g437c971
 	pkgrel = 1
 	url = https://containerd.tools/
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 842c9a56dde9..05654547ebc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # $Id$
-# Maintainer: Chris Fordham
+# Maintainer: Chris Fordham aka flaccid
 
 pkgname=containerd-git
 _pkgname=containerd
-pkgver=v0.2.3.r2.g95d78ca
+pkgver=v0.2.3.r201.g437c971
 pkgrel=1
 pkgdesc='A daemon to control runC, built for performance and density'
 url='https://containerd.tools/'
@@ -21,19 +21,41 @@ pkgver() {
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+  export GOPATH="$srcdir/go"
+  mkdir -p "$GOPATH/src/github.com/docker"
+  ln -rsf "$srcdir/containerd" "$GOPATH/src/github.com/docker/containerd"
+  pushd "$GOPATH/src/github.com/docker/containerd"
+    # needs to be fixed upstream
+    # likely via https://github.com/docker/containerd/pull/400
+    go get -u golang.org/x/net/http2
+    go get github.com/gogo/protobuf/gogoproto
+    go get github.com/nats-io/go-nats
+    go get github.com/opencontainers/runtime-spec/specs-go
+    go get github.com/sirupsen/logrus
+    go get github.com/tonistiigi/fifo
+    go get google.golang.org/grpc
+    go get github.com/crosbymichael/go-runc
+    go get github.com/docker/go-metrics
+    go get github.com/nats-io/nats-streaming-server/server
+    go get github.com/opencontainers/runc/libcontainer/system
+    go get github.com/urfave/cli
+  popd
+}
+
 build() {
-  export GOPATH="$srcdir"
-  mkdir -p src/github.com/docker
-  ln -rsf containerd src/github.com/docker
-  cd src/github.com/docker/containerd
-  LDFLAGS= make
+  pushd "$GOPATH/src/github.com/docker/containerd"
+    make setup
+    make
+  popd
 }
 
 package() {
-  cd src/github.com/docker/containerd/bin
-  for file in $(find . -type f -print); do
-    install -Dm755 $file $pkgdir/usr/bin/$file
-  done
+  pushd "$GOPATH/src/github.com/docker/containerd/bin"
+    for f in $(find . -type f -print); do
+      install -Dm755 "$f" "$pkgdir/usr/bin/$f"
+    done
+  popd
 }
 
 # vim:set ts=2 sw=2 et: