From e3a1fe1ee59bd91dfd77fe7e1e396e6e0ab81838 Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Thu, 16 Jul 2015 19:48:27 +0300 Subject: Fix rkt build process --- .SRCINFO | 4 +++- PKGBUILD | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5ba43c3..96049d0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,13 +1,15 @@ pkgbase = rkt pkgdesc = App container runtime pkgver = 0.7.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/coreos/rkt arch = x86_64 license = apache makedepends = cpio makedepends = go makedepends = squashfs-tools + makedepends = perl-capture-tiny + depends = glibc provides = rkt conflicts = rocket replaces = rocket diff --git a/PKGBUILD b/PKGBUILD index da1115f..cf6cc43 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,28 +1,39 @@ # Maintainer: Yuval Adam PGP-Key: 271386AA2EB7672F # Contributor: Kenny Rasschaert PGP-Key: 1F70454121E41419 +# Contributor: Adrián Pérez de Castro PGP-Key: 91C559DBE4C9123B pkgname=rkt pkgver=0.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="App container runtime" arch=('x86_64') url="https://github.com/coreos/rkt" license=(apache) -makedepends=('cpio' 'go' 'squashfs-tools') +depends=('glibc') +makedepends=('cpio' 'go' 'squashfs-tools' 'perl-capture-tiny') provides=('rkt') replaces=('rocket') conflicts=('rocket') source=("https://github.com/coreos/rkt/archive/v${pkgver}.tar.gz") sha256sums=('1e5996c9c26a69f107d9d4f8dd2a3e55ca3a9b8491ecbd9fe2dfe423c7c384ce') +prepare() { + cd "${pkgname}-${pkgver}" + ./autogen.sh +} + build() { cd "${pkgname}-${pkgver}" - 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}-${pkgver}" + cd "${pkgname}-${pkgver}/build-${pkgname}-${pkgver}" 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