From e097200be3a732cde9b88311a93b688d60dc94bc Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Sat, 23 Feb 2019 18:18:53 -0300
Subject: [PATCH] rkt: fix inconsistencies

---
 srcpkgs/rkt-stage1-kvm |  1 -
 srcpkgs/rkt/template   | 49 ++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 27 deletions(-)
 delete mode 120000 srcpkgs/rkt-stage1-kvm

diff --git a/srcpkgs/rkt-stage1-kvm b/srcpkgs/rkt-stage1-kvm
deleted file mode 120000
index 9572e0e83de..00000000000
--- a/srcpkgs/rkt-stage1-kvm
+++ /dev/null
@@ -1 +0,0 @@
-rkt
\ No newline at end of file
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 188dfe52226..84d4e32837a 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -3,6 +3,10 @@ pkgname=rkt
 version=1.30.0
 revision=2
 build_style=gnu-configure
+# KVM support broken
+configure_args="--enable-tpm=no --enable-sdjournal=no
+ --with-stage1-flavors=fly,coreos,host
+ --with-stage1-default-location=/usr/lib/rkt/stage1.aci"
 hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go"
 makedepends="acl-devel zlib-devel libressl-devel"
 depends="virtual?rkt-stage1"
@@ -16,37 +20,30 @@ checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d
 patch_args="-Np1"
 nopie=yes
 
-# KVM support broken
-configure_args="--enable-tpm=no
---enable-sdjournal=no
---with-stage1-flavors=fly,coreos,host
---with-stage1-default-location=/usr/lib/rkt/stage1.aci"
-
 system_groups="rkt"
 
 nocross=yes
 
-only_for_archs="x86_64 x86_64-musl"
+archs="x86_64*"
 
-make_dirs="
-/var/lib/rkt 2750 root rkt
-/var/lib/rkt/tmp 2750 root rkt
-/var/lib/rkt/cas 2770 root rkt
-/var/lib/rkt/cas/db 2770 root rkt
-/var/lib/rkt/cas/imagelocks 2770 root rkt
-/var/lib/rkt/cas/imageManifest 2770 root rkt
-/var/lib/rkt/cas/blob 2770 root rkt
-/var/lib/rkt/cas/tmp 2770 root rkt
-/var/lib/rkt/cas/tree 2700 root rkt
-/var/lib/rkt/cas/treestorelocks 2700 root rkt
-/var/lib/rkt/locks 2750 root rkt
-/var/lib/rkt/pods 2750 root rkt
-/var/lib/rkt/pods/embryo 2750 root rkt
-/var/lib/rkt/pods/prepare 2750 root rkt
-/var/lib/rkt/pods/prepared 2750 root rkt
-/var/lib/rkt/pods/run 2750 root rkt
-/var/lib/rkt/pods/exited-garbage 2750 root rkt
-/var/lib/rkt/pods/garbage 2750 root rkt"
+make_dirs="/var/lib/rkt 2750 root rkt
+ /var/lib/rkt/tmp 2750 root rkt
+ /var/lib/rkt/cas 2770 root rkt
+ /var/lib/rkt/cas/db 2770 root rkt
+ /var/lib/rkt/cas/imagelocks 2770 root rkt
+ /var/lib/rkt/cas/imageManifest 2770 root rkt
+ /var/lib/rkt/cas/blob 2770 root rkt
+ /var/lib/rkt/cas/tmp 2770 root rkt
+ /var/lib/rkt/cas/tree 2700 root rkt
+ /var/lib/rkt/cas/treestorelocks 2700 root rkt
+ /var/lib/rkt/locks 2750 root rkt
+ /var/lib/rkt/pods 2750 root rkt
+ /var/lib/rkt/pods/embryo 2750 root rkt
+ /var/lib/rkt/pods/prepare 2750 root rkt
+ /var/lib/rkt/pods/prepared 2750 root rkt
+ /var/lib/rkt/pods/run 2750 root rkt
+ /var/lib/rkt/pods/exited-garbage 2750 root rkt
+ /var/lib/rkt/pods/garbage 2750 root rkt"
 
 pre_configure() {
 	rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch