From 007376b4f5171b911c75d25e99968a3defc7ee14 Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Tue, 30 Jun 2015 15:52:14 +0300 Subject: Initial import --- .SRCINFO | 20 ++++++++++++++++++++ PKGBUILD | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..33c6d6c --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,20 @@ +pkgbase = rkt-git + pkgdesc = App container runtime + pkgver = 0.5.6.r22.g2440b4a + pkgrel = 1 + url = https://github.com/coreos/rkt + arch = x86_64 + license = apache + makedepends = cpio + makedepends = go + makedepends = squashfs-tools + provides = rkt + conflicts = rocket + conflicts = rkt + replaces = rocket + replaces = rkt + source = rkt-git::git+https://github.com/coreos/rkt + md5sums = SKIP + +pkgname = rkt-git + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..e525636 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Yuval Adam PGP-Key: 271386AA2EB7672F +# Contributor: Kenny Rasschaert PGP-Key: 1F70454121E41419 +# Contributor: Boohbah + +pkgname=rkt-git +pkgver=0.5.6.r22.g2440b4a +pkgrel=1 +pkgdesc="App container runtime" +arch=('x86_64') +url="https://github.com/coreos/rkt" +license=(apache) +makedepends=('cpio' 'go' 'squashfs-tools') +provides=('rkt') +replaces=('rocket' 'rkt') +conflicts=('rocket' 'rkt') +source=("$pkgname::git+$url") +md5sums=('SKIP') + +pkgver() { + cd "$pkgname" + git describe --long | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' +} + +build() { + cd "$pkgname" + RKT_STAGE1_IMAGE=/usr/share/rkt/stage1.aci ./build +} + +package() { + cd "$pkgname" + install -Dm755 bin/rkt "$pkgdir/usr/bin/rkt" + install -Dm644 bin/stage1.aci "$pkgdir/usr/share/rkt/stage1.aci" +} + +# vim:set ts=2 sw=2 et: -- cgit v1.3.1 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 From 0c8765bab716051bb15c6b9ceee3bd8fd669849c Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Tue, 21 Jul 2015 18:18:48 +0300 Subject: Add systemd units and post_install rkt group creation --- .SRCINFO | 3 ++- PKGBUILD | 13 +++++++++++-- rkt.install | 11 +++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 rkt.install diff --git a/.SRCINFO b/.SRCINFO index 15af3c9..75a3333 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,9 @@ pkgbase = rkt-git pkgdesc = App container runtime - pkgver = 0.7.0.r47.gfd6e630 + pkgver = 0.7.0.r70.g278f2e9 pkgrel = 1 url = https://github.com/coreos/rkt + install = rkt.install arch = x86_64 license = apache makedepends = cpio diff --git a/PKGBUILD b/PKGBUILD index 816f341..fbc382c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Boohbah pkgname=rkt-git -pkgver=0.7.0.r47.gfd6e630 +pkgver=0.7.0.r70.g278f2e9 pkgrel=1 pkgdesc="App container runtime" arch=('x86_64') @@ -16,6 +16,7 @@ replaces=('rocket' 'rkt') conflicts=('rocket' 'rkt') source=("$pkgname::git+$url") md5sums=('SKIP') +install="rkt.install" pkgver() { cd "$pkgname" @@ -36,7 +37,15 @@ build() { } package() { - cd "${pkgname}"/build-rkt-*+git + cd "${pkgname}" + local unit + for unit in rkt-gc.{timer,service} rkt-metadata.{socket,service} + do + install -Dm644 "dist/init/systemd/${unit}" \ + "${pkgdir}/usr/lib/systemd/system/${unit}" + done + + cd 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" diff --git a/rkt.install b/rkt.install new file mode 100644 index 0000000..2f696ac --- /dev/null +++ b/rkt.install @@ -0,0 +1,11 @@ +post_install () { + # Create users/groups + getent group rkt >/dev/null || groupadd -r rkt + rkt install &>/dev/null +} + +post_upgrade () { + post_install "$@" +} + +# vim:ts=2 sw=2 et ft=sh: -- cgit v1.3.1 From be46dab97a2c9225aab739eb45bedb69a97e7217 Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Tue, 11 Aug 2015 17:11:35 +0300 Subject: Add wget makedepends --- .SRCINFO | 3 ++- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 75a3333..419a45e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,13 +1,14 @@ pkgbase = rkt-git pkgdesc = App container runtime pkgver = 0.7.0.r70.g278f2e9 - pkgrel = 1 + pkgrel = 2 url = https://github.com/coreos/rkt install = rkt.install arch = x86_64 license = apache makedepends = cpio makedepends = go + makedepends = wget makedepends = squashfs-tools makedepends = perl-capture-tiny provides = rkt diff --git a/PKGBUILD b/PKGBUILD index fbc382c..4c74aca 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,12 +5,12 @@ pkgname=rkt-git pkgver=0.7.0.r70.g278f2e9 -pkgrel=1 +pkgrel=2 pkgdesc="App container runtime" arch=('x86_64') url="https://github.com/coreos/rkt" license=(apache) -makedepends=('cpio' 'go' 'squashfs-tools' 'perl-capture-tiny') +makedepends=('cpio' 'go' 'wget' 'squashfs-tools' 'perl-capture-tiny') provides=('rkt') replaces=('rocket' 'rkt') conflicts=('rocket' 'rkt') -- cgit v1.3.1 From 73c6c1f7d85fa833d828b36a7c712703e8f57382 Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Thu, 27 Aug 2015 13:30:29 +0300 Subject: Add missing intltool dep --- .SRCINFO | 5 +++-- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 419a45e..40b9251 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = rkt-git pkgdesc = App container runtime - pkgver = 0.7.0.r70.g278f2e9 - pkgrel = 2 + pkgver = 0.8.0.r47.gd71fda7 + pkgrel = 1 url = https://github.com/coreos/rkt install = rkt.install arch = x86_64 @@ -11,6 +11,7 @@ pkgbase = rkt-git makedepends = wget makedepends = squashfs-tools makedepends = perl-capture-tiny + makedepends = intltool provides = rkt conflicts = rocket conflicts = rkt diff --git a/PKGBUILD b/PKGBUILD index 4c74aca..19106b9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,13 +4,13 @@ # Contributor: Boohbah pkgname=rkt-git -pkgver=0.7.0.r70.g278f2e9 -pkgrel=2 +pkgver=0.8.0.r47.gd71fda7 +pkgrel=1 pkgdesc="App container runtime" arch=('x86_64') url="https://github.com/coreos/rkt" license=(apache) -makedepends=('cpio' 'go' 'wget' 'squashfs-tools' 'perl-capture-tiny') +makedepends=('cpio' 'go' 'wget' 'squashfs-tools' 'perl-capture-tiny' 'intltool') provides=('rkt') replaces=('rocket' 'rkt') conflicts=('rocket' 'rkt') -- cgit v1.3.1 From a9143e17a91dc5665d0d7407bd54a2b48129a26b Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Fri, 30 Oct 2015 19:35:11 +0200 Subject: Add bc makedep --- .SRCINFO | 3 ++- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 40b9251..0d5f8c9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = rkt-git pkgdesc = App container runtime - pkgver = 0.8.0.r47.gd71fda7 + pkgver = 0.10.0.r56.g21fd43a pkgrel = 1 url = https://github.com/coreos/rkt install = rkt.install @@ -12,6 +12,7 @@ pkgbase = rkt-git makedepends = squashfs-tools makedepends = perl-capture-tiny makedepends = intltool + makedepends = bc provides = rkt conflicts = rocket conflicts = rkt diff --git a/PKGBUILD b/PKGBUILD index 19106b9..0fe8890 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,13 +4,13 @@ # Contributor: Boohbah pkgname=rkt-git -pkgver=0.8.0.r47.gd71fda7 +pkgver=0.10.0.r56.g21fd43a pkgrel=1 pkgdesc="App container runtime" arch=('x86_64') url="https://github.com/coreos/rkt" license=(apache) -makedepends=('cpio' 'go' 'wget' 'squashfs-tools' 'perl-capture-tiny' 'intltool') +makedepends=('cpio' 'go' 'wget' 'squashfs-tools' 'perl-capture-tiny' 'intltool' 'bc') provides=('rkt') replaces=('rocket' 'rkt') conflicts=('rocket' 'rkt') -- cgit v1.3.1 From 7fc0b18386e7ee7b7e840d9a697f748d411a7ab4 Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Tue, 17 Nov 2015 12:40:18 +0200 Subject: Configuration cleanup --- .SRCINFO | 2 +- PKGBUILD | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0d5f8c9..f8cc835 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = rkt-git pkgdesc = App container runtime - pkgver = 0.10.0.r56.g21fd43a + pkgver = 0.11.0.r12.gfad1cb1 pkgrel = 1 url = https://github.com/coreos/rkt install = rkt.install diff --git a/PKGBUILD b/PKGBUILD index 0fe8890..c733477 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Boohbah pkgname=rkt-git -pkgver=0.10.0.r56.g21fd43a +pkgver=0.11.0.r12.gfad1cb1 pkgrel=1 pkgdesc="App container runtime" arch=('x86_64') @@ -31,8 +31,8 @@ prepare() { build() { cd "$pkgname" ./configure --prefix=/usr \ - --with-stage1=coreos \ - --with-stage1-image-path=/usr/share/rkt/stage1.aci + --with-stage1-flavors=coreos \ + --with-stage1-default-location=/usr/lib/rkt/stage1.aci make -s } @@ -47,8 +47,7 @@ package() { cd 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" + install -Dm644 bin/stage1-coreos.aci "$pkgdir/usr/lib/rkt/stage1.aci" } # vim:set ts=2 sw=2 et: -- cgit v1.3.1