From 39d5ce89fd10d58651c7e15d6a5ef531095cb76a Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Thu, 16 Jul 2015 19:50:41 +0300 Subject: Fix rkt-git build process --- .SRCINFO | 3 ++- PKGBUILD | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 33c6d6c..15af3c9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = rkt-git pkgdesc = App container runtime - pkgver = 0.5.6.r22.g2440b4a + pkgver = 0.7.0.r47.gfd6e630 pkgrel = 1 url = https://github.com/coreos/rkt arch = x86_64 @@ -8,6 +8,7 @@ pkgbase = rkt-git makedepends = cpio makedepends = go makedepends = squashfs-tools + makedepends = perl-capture-tiny provides = rkt conflicts = rocket conflicts = rkt diff --git a/PKGBUILD b/PKGBUILD index e525636..816f341 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,15 +1,16 @@ # Maintainer: Yuval Adam PGP-Key: 271386AA2EB7672F # Contributor: Kenny Rasschaert PGP-Key: 1F70454121E41419 +# Contributor: Adrián Pérez de Castro PGP-Key: 91C559DBE4C9123B # Contributor: Boohbah pkgname=rkt-git -pkgver=0.5.6.r22.g2440b4a +pkgver=0.7.0.r47.gfd6e630 pkgrel=1 pkgdesc="App container runtime" arch=('x86_64') url="https://github.com/coreos/rkt" license=(apache) -makedepends=('cpio' 'go' 'squashfs-tools') +makedepends=('cpio' 'go' 'squashfs-tools' 'perl-capture-tiny') provides=('rkt') replaces=('rocket' 'rkt') conflicts=('rocket' 'rkt') @@ -21,14 +22,23 @@ pkgver() { git describe --long | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' } +prepare() { + cd "${pkgname}" + ./autogen.sh +} + build() { cd "$pkgname" - RKT_STAGE1_IMAGE=/usr/share/rkt/stage1.aci ./build + ./configure --prefix=/usr \ + --with-stage1=coreos \ + --with-stage1-image-path=/usr/share/rkt/stage1.aci + make -s } package() { - cd "$pkgname" + cd "${pkgname}"/build-rkt-*+git install -Dm755 bin/rkt "$pkgdir/usr/bin/rkt" + install -Dm755 bin/actool "$pkgdir/usr/bin/actool" install -Dm644 bin/stage1.aci "$pkgdir/usr/share/rkt/stage1.aci" } -- cgit v1.3.1