Update for 0.8.1

Large update, now includes vmlogd. Requires patch to build against
btrfs-progs>=4.5, should be dropped as soon as vendored version is
updated.

1 files changed, 30 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 57a0bb435a59..f2933d990aab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Jonathon Fernyhough <jonathon@manjaro.org>
+# Maintainer: Jonathon Fernyhough <jonathon_at_manjaro_dot_org>
 
 pkgname=hyperd
-pkgver=0.7.0
+pkgver=0.8.1
 pkgrel=1
 pkgdesc="Hypervisor-agnostic Docker Runtime"
 arch=('i686' 'x86_64')
@@ -11,25 +11,38 @@ depends=('libvirt')
 makedepends=('device-mapper' 'sqlite3' 'libvirt' 'go')
 optdepends=('hyperstart: boot files for hyperd instances')
 options=('!strip' '!emptydirs')
-source=("hyperd-$pkgver.tar.gz::https://github.com/hyperhq/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=('e79d4e6aebe01d2117e981050ecb88dd24f8a9e45e2fbe1a558bcd1ee5d90b88')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/hyperhq/${pkgname}/archive/v${pkgver}.tar.gz"
+        'btrfs-progs-4.5.diff')
+sha256sums=('4b82884cbc75115006000f755e1ad5833309911c6d020977d874dffb0882628f'
+            '12fe84f2711fdcb35811765d5efb117e947a893c11fdc2e6f1e060e63917ee9d')
 
-build() {
-  cd "${pkgname}-${pkgver}"
+prepare() {
+    cd "${pkgname}-${pkgver}"
+    # https://github.com/hyperhq/hyperd/issues/643
+    # https://github.com/moby/moby/commit/a038cccf88998814249a7a40b71a33a680e3f02f
+    patch -Np0 -i "${srcdir}/btrfs-progs-4.5.diff"
+}
 
-  # Needs to be able to find itself in $GOPATH
-  ln -s $(pwd) Godeps/_workspace/src/github.com/hyperhq/${pkgname}
+build() {
+    cd "${pkgname}-${pkgver}"
+    local _srcpath="src/github.com/hyperhq/"
+    export GOPATH="${srcdir}"
+    install -d "$GOPATH/$_srcpath"
+    ln -sf "$(pwd)" "$GOPATH/$_srcpath/hyperd"
+    cd "$GOPATH/$_srcpath/hyperd"
 
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
+    ./autogen.sh
+    ./configure --prefix=/usr
+    make
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
-  
-  install -D hyperctl "${pkgdir}/usr/bin/hyperctl"
-  install -D hyperd "${pkgdir}/usr/bin/hyperd"
-  install -D -m644 package/dist/etc/hyper/config "${pkgdir}/etc/hyper/config"
-  install -D -m644 package/dist/lib/systemd/system/hyperd.service "${pkgdir}/usr/lib/systemd/system/hyperd.service"
+    cd "${pkgname}-${pkgver}"
+
+    install -D hyperctl "${pkgdir}/usr/bin/hyperctl"
+    install    hyperd   "${pkgdir}/usr/bin/hyperd"
+    install    vmlogd   "${pkgdir}/usr/bin/vmlogd"
+    install -D -m644 package/dist/etc/hyper/config "${pkgdir}/etc/hyper/config"
+    install -D -m644 package/dist/lib/systemd/system/hyperd.service "${pkgdir}/usr/lib/systemd/system/hyperd.service"
+    install    -m644 package/dist/lib/systemd/system/hyper-vmlogd.service "${pkgdir}/usr/lib/systemd/system/hyper-vmlogd.service"
 }