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

[Massimiliano Torromeo]

    Date: Saturday, October 7, 2017 @ 14:56:41
  Author: mtorromeo
Revision: 262077

upgpkg: rkt 1.29.0-1

Modified:
  rkt/trunk/PKGBUILD

----------+
 PKGBUILD |   41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-07 13:00:05 UTC (rev 262076)
+++ PKGBUILD	2017-10-07 14:56:41 UTC (rev 262077)
@@ -7,7 +7,7 @@
 # Contributor: Carl George <arch at cgtx dot us> PGP-Key: 4BA2F7E101D9F512
 
 pkgname=rkt
-pkgver=1.28.1
+pkgver=1.29.0
 pkgrel=1
 pkgdesc="App container runtime"
 arch=('x86_64')
@@ -18,8 +18,8 @@
              'intltool' 'gperf' 'git' 'libseccomp' 'bc' 'python2')
 
 # stage1/usr_from_coreos/coreos-common.mk
-CCN_IMG_RELEASE=1235.0.0
-CCN_SYSTEMD_VERSION=v231
+CCN_IMG_RELEASE=1478.0.0
+CCN_SYSTEMD_VERSION=v233
 
 # stage1/usr_from_kvm/kernel.mk
 KERNEL_VERSION=4.9.2
@@ -33,31 +33,36 @@
         https://www.kernel.org/pub/linux/kernel/v4.x/linux-$KERNEL_VERSION.tar.xz
         https://www.kernel.org/pub/linux/kernel/v4.x/linux-$KERNEL_VERSION.tar.sign
         kvmtool-$KVMTOOL_VERSION.tar.gz::https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/$KVMTOOL_VERSION.tar.gz
-        rkt.sysusers
-        ilog2.patch)
+        rkt.sysusers)
 noextract=(coreos_production_pxe_image.cpio.gz
            kvmtool-$KVMTOOL_VERSION.tar.gz)
 validpgpkeys=('04127D0BFABEC8871FFB2CCE50E0885593D2DCB4' # CoreOS Buildbot
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
               )
-sha256sums=('2610749f412ca697c57a797c8dd0024c4c215d7dd824599d8ed6f4297abd5e07'
-            '988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315'
+sha256sums=('d2d89db86b4b3a586a8288ba7becdb87370d4fbe7e12aa37e9b1e30a9f9c9b20'
+            '9897f9e78e207da42a75d03f7ff74c4400dce15843b752adcb3182ebe66c9868'
             'SKIP'
             '8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738'
             'SKIP'
-            'd827b98909d3ec6ddf0b0221ee7b89568e3d0b0333c2214f36a480c67fa53709'
-            '2aee4e8547843f4e6c032761b97cb723c1ecd384d508b86f44d16826bc34d6d6'
-            '4b836472870b94f74294752af259751ce87bc0c53a3d40f93a70da3bf6512bdf')
+            'efd2c3e1478cff0fdf5de8b5192cf6f5401f279c760ef96cc2689b3579a47af4'
+            '2aee4e8547843f4e6c032761b97cb723c1ecd384d508b86f44d16826bc34d6d6')
 
 prepare() {
   cd "$srcdir"/$pkgname-$pkgver
   mkdir -p build-rkt-$pkgver/tmp/usr_from_kvm/{lkvm/src,kernel}
 
-  # disable git fetch of kvmtool
-  sed -r '/^include makelib\/git.mk$/d' -i stage1/usr_from_kvm/lkvm.mk
   bsdtar -xf "$srcdir"/kvmtool-$KVMTOOL_VERSION.tar.gz \
          -C build-rkt-$pkgver/tmp/usr_from_kvm/lkvm/src
 
+  # place prefetched kernel sources
+  ln -s "$srcdir"/linux-$KERNEL_VERSION.tar.xz \
+      build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
+  ln -s "$srcdir"/linux-$KERNEL_VERSION \
+      build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
+
+  # disable git fetch of kvmtool
+  sed -r '/^include makelib\/git.mk$/d' -i stage1/usr_from_kvm/lkvm.mk
+
   # fix makedev definition
   sed '/^#include <sys\/stat.h>$/a #include <sys/sysmacros.h>' -i \
       build-rkt-$pkgver/tmp/usr_from_kvm/lkvm/src/virtio/9p.c
@@ -66,14 +71,10 @@
   sed '/^\$(call forward-vars,\$(KERNEL_MAKEFILE)/,/tar --extract/d' -i \
       stage1/usr_from_kvm/kernel.mk
 
-  # place prefetched kernel sources
-  ln -s "$srcdir"/linux-$KERNEL_VERSION.tar.xz \
-        build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
-  ln -s "$srcdir"/linux-$KERNEL_VERSION \
-        build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
-
-  cd build-rkt-$pkgver/tmp/usr_from_kvm/kernel/linux-$KERNEL_VERSION
-  patch -p1 -i "$srcdir"/ilog2.patch
+  # fix for asm headers not found
+  cd build-rkt-$pkgver/tmp/usr_from_kvm/lkvm/src/x86
+  ln -s "$srcdir"/linux-$KERNEL_VERSION/arch/x86/include/asm/
+  sed -E 's/include <(asm\/.*\.h)>/include "\1"/' -i kvm-cpu.c
 }
 
 build() {