[arch-commits] Commit in rkt/repos/community-x86_64 (5 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Mon Mar 6 20:33:42 UTC 2017
Date: Monday, March 6, 2017 @ 20:33:42
Author: mtorromeo
Revision: 215156
archrelease: copy trunk to community-x86_64
Added:
rkt/repos/community-x86_64/PKGBUILD
(from rev 215155, rkt/trunk/PKGBUILD)
rkt/repos/community-x86_64/rkt.sysusers
(from rev 215155, rkt/trunk/rkt.sysusers)
Deleted:
rkt/repos/community-x86_64/PKGBUILD
rkt/repos/community-x86_64/rkt-1.15.0-stage1-host-reorder-systemd-nspawn-args.patch
rkt/repos/community-x86_64/rkt.sysusers
----------------------------------------------------------+
PKGBUILD | 195 ++++++-------
rkt-1.15.0-stage1-host-reorder-systemd-nspawn-args.patch | 35 --
rkt.sysusers | 4
3 files changed, 100 insertions(+), 134 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-03-06 20:33:20 UTC (rev 215155)
+++ PKGBUILD 2017-03-06 20:33:42 UTC (rev 215156)
@@ -1,97 +0,0 @@
-# $Id$
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-
-# Contributor: Yuval Adam <yuval at y3xz dot com> PGP-Key: 271386AA2EB7672F
-# Contributor: Kenny Rasschaert <kenny dot rasschaert at gmail dot com> PGP-Key: 1F70454121E41419
-# Contributor: Adrián Pérez de Castro <adrian at perezdecastro dor org> PGP-Key: 91C559DBE4C9123B
-# Contributor: Carl George <arch at cgtx dot us> PGP-Key: 4BA2F7E101D9F512
-
-pkgname=rkt
-pkgver=1.24.0
-pkgrel=1
-pkgdesc="App container runtime"
-arch=('x86_64')
-url="https://github.com/coreos/rkt"
-license=(apache)
-depends=('glibc' 'openssl' 'zlib' 'systemd')
-makedepends=('cpio' 'go' 'wget' 'squashfs-tools' 'perl-capture-tiny'
- 'intltool' 'gperf' 'git' 'libseccomp' 'bc')
-
-# stage1/usr_from_coreos/coreos-common.mk
-CCN_IMG_RELEASE=1235.0.0
-CCN_SYSTEMD_VERSION=v231
-
-# stage1/usr_from_kvm/kernel.mk
-KERNEL_VERSION=4.9.2
-
-source=(https://github.com/coreos/rkt/archive/v$pkgver/$pkgname-$pkgver.tar.gz
- coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz::http://alpha.release.core-os.net/amd64-usr/$CCN_IMG_RELEASE/coreos_production_pxe_image.cpio.gz
- coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz.sig::http://alpha.release.core-os.net/amd64-usr/$CCN_IMG_RELEASE/coreos_production_pxe_image.cpio.gz.sig
- https://www.kernel.org/pub/linux/kernel/v4.x/linux-$KERNEL_VERSION.tar.xz
- rkt.sysusers)
-noextract=(coreos_production_pxe_image.cpio.gz
- linux-$KERNEL_VERSION.tar.xz)
-validpgpkeys=('04127D0BFABEC8871FFB2CCE50E0885593D2DCB4' '48F9B96A2E16137F')
-sha256sums=('ffeb9933d58a642a5dde4730eacde9a597345698120cf36283e02cf2ed085e2d'
- '988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315'
- 'SKIP'
- '8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738'
- '2aee4e8547843f4e6c032761b97cb723c1ecd384d508b86f44d16826bc34d6d6')
-
-prepare() {
- cd $pkgname-$pkgver
- mkdir -p build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
- cd build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
- ln -s "$srcdir"/linux-$KERNEL_VERSION.tar.xz
-}
-
-build() {
- cd $pkgname-$pkgver
- export GOPATH="$PWD/Godeps/_workspace/src"
-
- ./autogen.sh
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --localstatedir=/var \
- --enable-tpm=auto \
- --with-stage1-flavors=coreos,kvm,host,fly \
- --with-stage1-default-flavor=host \
- --with-stage1-default-images-directory=/usr/lib/rkt/stage1-images \
- --with-stage1-default-location=/usr/lib/rkt/stage1-images/stage1-host.aci \
- --with-coreos-local-pxe-image-path="$srcdir"/coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz \
- --with-coreos-local-pxe-image-systemd-version=$CCN_SYSTEMD_VERSION
-
- make manpages
- make bash-completion
- make
-}
-
-package() {
- cd $pkgname-$pkgver/dist/init/systemd
-
- for unit in *.service *.timer *.socket; do
- install -Dm644 $unit "$pkgdir"/usr/lib/systemd/system/$unit
- done
-
- for tmpfile in tmpfiles.d/*.conf; do
- install -Dm644 $tmpfile "$pkgdir"/usr/lib/$tmpfile
- done
-
- cd "$srcdir"/$pkgname-$pkgver
- install -Dm644 "$srcdir"/rkt.sysusers "$pkgdir"/usr/lib/sysusers.d/rkt.conf
- install -Dm644 dist/bash_completion/rkt.bash "$pkgdir"/usr/share/bash-completion/completions/rkt
-
- cd dist/manpages
- for f in *; do
- install -Dm644 "$f" "$pkgdir/usr/share/man/man1/$f"
- done
- cd ../..
-
- cd build-$pkgname-$pkgver
- install -dm755 "$pkgdir"/usr/bin "$pkgdir"/usr/lib/rkt/stage1-images
- mv target/bin/rkt tools/actool "$pkgdir"/usr/bin
- mv target/bin/stage1-*.aci "$pkgdir"/usr/lib/rkt/stage1-images/
-}
-
-# vim:set ts=2 sw=2 et:
Copied: rkt/repos/community-x86_64/PKGBUILD (from rev 215155, rkt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-03-06 20:33:42 UTC (rev 215156)
@@ -0,0 +1,98 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+
+# Contributor: Yuval Adam <yuval at y3xz dot com> PGP-Key: 271386AA2EB7672F
+# Contributor: Kenny Rasschaert <kenny dot rasschaert at gmail dot com> PGP-Key: 1F70454121E41419
+# Contributor: Adrián Pérez de Castro <adrian at perezdecastro dor org> PGP-Key: 91C559DBE4C9123B
+# Contributor: Carl George <arch at cgtx dot us> PGP-Key: 4BA2F7E101D9F512
+
+pkgname=rkt
+pkgver=1.25.0
+pkgrel=1
+pkgdesc="App container runtime"
+arch=('x86_64')
+url="https://github.com/coreos/rkt"
+license=(apache)
+depends=('glibc' 'openssl' 'zlib' 'systemd')
+makedepends=('cpio' 'go' 'wget' 'squashfs-tools' 'perl-capture-tiny'
+ 'intltool' 'gperf' 'git' 'libseccomp' 'bc')
+
+# stage1/usr_from_coreos/coreos-common.mk
+CCN_IMG_RELEASE=1235.0.0
+CCN_SYSTEMD_VERSION=v231
+
+# stage1/usr_from_kvm/kernel.mk
+KERNEL_VERSION=4.9.2
+
+source=(https://github.com/coreos/rkt/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+ coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz::http://alpha.release.core-os.net/amd64-usr/$CCN_IMG_RELEASE/coreos_production_pxe_image.cpio.gz
+ coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz.sig::http://alpha.release.core-os.net/amd64-usr/$CCN_IMG_RELEASE/coreos_production_pxe_image.cpio.gz.sig
+ https://www.kernel.org/pub/linux/kernel/v4.x/linux-$KERNEL_VERSION.tar.xz
+ rkt.sysusers)
+noextract=(coreos_production_pxe_image.cpio.gz
+ linux-$KERNEL_VERSION.tar.xz)
+validpgpkeys=('04127D0BFABEC8871FFB2CCE50E0885593D2DCB4' '48F9B96A2E16137F')
+sha256sums=('090da380ae8526d2a819f777fa983aee0df6254c37eb1fd74783d2d4c4ced359'
+ '988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315'
+ 'SKIP'
+ '8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738'
+ '2aee4e8547843f4e6c032761b97cb723c1ecd384d508b86f44d16826bc34d6d6')
+
+prepare() {
+ cd $pkgname-$pkgver
+ mkdir -p build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
+ cd build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
+ ln -s "$srcdir"/linux-$KERNEL_VERSION.tar.xz
+}
+
+build() {
+ cd $pkgname-$pkgver
+ export GOPATH="$PWD/Godeps/_workspace/src"
+
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --localstatedir=/var \
+ --enable-tpm=auto \
+ --with-stage1-flavors=coreos,kvm,host,fly \
+ --with-stage1-kvm-hypervisors=lkvm \
+ --with-stage1-default-flavor=host \
+ --with-stage1-default-images-directory=/usr/lib/rkt/stage1-images \
+ --with-stage1-default-location=/usr/lib/rkt/stage1-images/stage1-host.aci \
+ --with-coreos-local-pxe-image-path="$srcdir"/coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz \
+ --with-coreos-local-pxe-image-systemd-version=$CCN_SYSTEMD_VERSION
+
+ make manpages
+ make bash-completion
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver/dist/init/systemd
+
+ for unit in *.service *.timer *.socket; do
+ install -Dm644 $unit "$pkgdir"/usr/lib/systemd/system/$unit
+ done
+
+ for tmpfile in tmpfiles.d/*.conf; do
+ install -Dm644 $tmpfile "$pkgdir"/usr/lib/$tmpfile
+ done
+
+ cd "$srcdir"/$pkgname-$pkgver
+ install -Dm644 "$srcdir"/rkt.sysusers "$pkgdir"/usr/lib/sysusers.d/rkt.conf
+ install -Dm644 dist/bash_completion/rkt.bash "$pkgdir"/usr/share/bash-completion/completions/rkt
+
+ cd dist/manpages
+ for f in *; do
+ install -Dm644 "$f" "$pkgdir/usr/share/man/man1/$f"
+ done
+ cd ../..
+
+ cd build-$pkgname-$pkgver
+ install -dm755 "$pkgdir"/usr/bin "$pkgdir"/usr/lib/rkt/stage1-images
+ mv target/bin/rkt tools/actool "$pkgdir"/usr/bin
+ mv target/bin/stage1-*.aci "$pkgdir"/usr/lib/rkt/stage1-images/
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: rkt-1.15.0-stage1-host-reorder-systemd-nspawn-args.patch
===================================================================
--- rkt-1.15.0-stage1-host-reorder-systemd-nspawn-args.patch 2017-03-06 20:33:20 UTC (rev 215155)
+++ rkt-1.15.0-stage1-host-reorder-systemd-nspawn-args.patch 2017-03-06 20:33:42 UTC (rev 215156)
@@ -1,35 +0,0 @@
-From 01e2e37dcb9d4c000991fa8be5708e6dab877e0e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lukas=20F=C3=BCrmetz?= <fuermetz at mailbox.org>
-Date: Sat, 17 Sep 2016 11:38:35 +0200
-Subject: [PATCH] stage1/host: reorder systemd-nspawn args
-
-This fixes #3215.
----
- stage1/init/init.go | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/stage1/init/init.go b/stage1/init/init.go
-index 62b6103..56255fc 100644
---- a/stage1/init/init.go
-+++ b/stage1/init/init.go
-@@ -392,9 +392,6 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
- if n != 1 || version < 220 {
- return nil, nil, fmt.Errorf("rkt needs systemd-nspawn >= 220. %s version not supported: %v", hostNspawnBin, versionStr)
- }
-- if version >= 231 {
-- args = append(args, "--notify-ready=yes") // From systemd v231
-- }
-
- // Copy systemd, bash, etc. in stage1 at run-time
- if err := installAssets(); err != nil {
-@@ -405,6 +402,10 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
- args = append(args, "--boot") // Launch systemd in the pod
- args = append(args, fmt.Sprintf("--register=true"))
-
-+ if version >= 231 {
-+ args = append(args, "--notify-ready=yes") // From systemd v231
-+ }
-+
- if context := os.Getenv(common.EnvSELinuxContext); context != "" {
- args = append(args, fmt.Sprintf("-Z%s", context))
- }
Deleted: rkt.sysusers
===================================================================
--- rkt.sysusers 2017-03-06 20:33:20 UTC (rev 215155)
+++ rkt.sysusers 2017-03-06 20:33:42 UTC (rev 215156)
@@ -1,2 +0,0 @@
-g rkt - -
-g rkt-admin - -
Copied: rkt/repos/community-x86_64/rkt.sysusers (from rev 215155, rkt/trunk/rkt.sysusers)
===================================================================
--- rkt.sysusers (rev 0)
+++ rkt.sysusers 2017-03-06 20:33:42 UTC (rev 215156)
@@ -0,0 +1,2 @@
+g rkt - -
+g rkt-admin - -
More information about the arch-commits
mailing list