[arch-commits] Commit in rkt/trunk (2 files)

[Massimiliano Torromeo]

    Date: Monday, March 6, 2017 @ 20:33:20
  Author: mtorromeo
Revision: 215155

upgpkg: rkt 1.25.0-1

Modified:
  rkt/trunk/PKGBUILD
Deleted:
  rkt/trunk/rkt-1.15.0-stage1-host-reorder-systemd-nspawn-args.patch

----------------------------------------------------------+
 PKGBUILD                                                 |    5 +
 rkt-1.15.0-stage1-host-reorder-systemd-nspawn-args.patch |   35 -------------
 2 files changed, 3 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-06 19:42:26 UTC (rev 215154)
+++ PKGBUILD	2017-03-06 20:33:20 UTC (rev 215155)
@@ -7,7 +7,7 @@
 # Contributor: Carl George <arch at cgtx dot us> PGP-Key: 4BA2F7E101D9F512
 
 pkgname=rkt
-pkgver=1.24.0
+pkgver=1.25.0
 pkgrel=1
 pkgdesc="App container runtime"
 arch=('x86_64')
@@ -32,7 +32,7 @@
 noextract=(coreos_production_pxe_image.cpio.gz
            linux-$KERNEL_VERSION.tar.xz)
 validpgpkeys=('04127D0BFABEC8871FFB2CCE50E0885593D2DCB4' '48F9B96A2E16137F')
-sha256sums=('ffeb9933d58a642a5dde4730eacde9a597345698120cf36283e02cf2ed085e2d'
+sha256sums=('090da380ae8526d2a819f777fa983aee0df6254c37eb1fd74783d2d4c4ced359'
             '988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315'
             'SKIP'
             '8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738'
@@ -56,6 +56,7 @@
     --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 \

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 19:42:26 UTC (rev 215154)
+++ rkt-1.15.0-stage1-host-reorder-systemd-nspawn-args.patch	2017-03-06 20:33:20 UTC (rev 215155)
@@ -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))
- 		}