[arch-commits] Commit in sysdig/trunk (PKGBUILD linux-5.6.patch)

[Massimiliano Torromeo]

    Date: Tuesday, April 7, 2020 @ 22:33:27
  Author: mtorromeo
Revision: 612541

patched for linux 5.6+

Added:
  sysdig/trunk/linux-5.6.patch
Modified:
  sysdig/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    9 ++++++---
 linux-5.6.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-07 22:27:26 UTC (rev 612540)
+++ PKGBUILD	2020-04-07 22:33:27 UTC (rev 612541)
@@ -4,7 +4,7 @@
 
 pkgname=sysdig
 pkgver=0.26.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Open source system-level exploration and troubleshooting tool"
 arch=('x86_64')
 url="https://www.sysdig.com/"
@@ -13,15 +13,18 @@
 makedepends=('cmake' 'pandoc' 'gtest')
 source=("https://github.com/draios/sysdig/archive/$pkgver/$pkgname-$pkgver.tar.gz"
         "bashcomp-location.patch"
-        "glibc.patch")
+        "glibc.patch"
+        "linux-5.6.patch")
 sha256sums=('d215d9b5835db6eec0dc6f0bac96552fd8bd7c71d3d6ed482423cdddd5b1c93e'
             'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b'
-            '9d9ee715500cb5c3709cf6a77e95421edaaae5f15dbb1c7c8ad2147cc9637939')
+            '9d9ee715500cb5c3709cf6a77e95421edaaae5f15dbb1c7c8ad2147cc9637939'
+            '21e0cfbc61a8fcfcc894984d6f4e654dc98ac7b40c476b1ae04fc66eb06b9193')
 
 prepare() {
   cd "$srcdir"/$pkgname-$pkgver
   patch -p1 -i "$srcdir"/bashcomp-location.patch
   patch -p1 -i "$srcdir"/glibc.patch
+  patch -p1 -i "$srcdir"/linux-5.6.patch
 }
 
 build() {

Added: linux-5.6.patch
===================================================================
--- linux-5.6.patch	                        (rev 0)
+++ linux-5.6.patch	2020-04-07 22:33:27 UTC (rev 612541)
@@ -0,0 +1,35 @@
+From 55a8525dfffdc18106d981d7a1f70b8bd34d064d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger at applied-asynchrony.com>
+Date: Sat, 4 Apr 2020 17:29:23 +0200
+Subject: [PATCH] Quick fix to compile with kernel 5.6 (#1609)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Intentionally minimalistic in order to reduce the impact on the codebase
+and (for now) to preserve compile-time compatibility with older kernels.
+
+sysdig-CLA-1.0-signed-off-by: Holger Hoffstätte <holger at applied-asynchrony.com>
+---
+ driver/ppm.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/driver/ppm.h b/driver/ppm.h
+index acd5fa01f..7efc2c3d6 100644
+--- a/driver/ppm.h
++++ b/driver/ppm.h
+@@ -23,6 +23,14 @@ or GPL2.txt for full copies of the license.
+ 
+ #include <linux/time.h>
+ 
++#ifndef timespec
++#define timespec timespec64
++#define timespec_to_ns timespec64_to_ns
++#define getnstimeofday ktime_get_real_ts64
++#define timeval __kernel_old_timeval
++#define compat_timespec old_timespec32
++#endif
++
+ /*
+  * Global defines
+  */