aboutsummaryrefslogtreecommitdiffstats
path: root/testing/flashcache-grsec
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-03-18 15:24:16 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-03-21 16:17:02 +0000
commit1f655eb62396fc4dd44c51268381730b71e53737 (patch)
tree690f8778b77e66076ebb449631bb1aa12c42dde5 /testing/flashcache-grsec
parentc01e9d4f645ed5b92cfa2a163d01397175a3335e (diff)
downloadaports-1f655eb62396fc4dd44c51268381730b71e53737.tar.bz2
aports-1f655eb62396fc4dd44c51268381730b71e53737.tar.xz
testing/flashcache-grsec: disable as it does not build with 4.4 kernel
Diffstat (limited to 'testing/flashcache-grsec')
-rw-r--r--testing/flashcache-grsec/APKBUILD14
-rw-r--r--testing/flashcache-grsec/kernel-4.2.patch36
2 files changed, 45 insertions, 5 deletions
diff --git a/testing/flashcache-grsec/APKBUILD b/testing/flashcache-grsec/APKBUILD
index c03b6cfd1b..bc00588c09 100644
--- a/testing/flashcache-grsec/APKBUILD
+++ b/testing/flashcache-grsec/APKBUILD
@@ -4,7 +4,7 @@ _kpkg=linux-$_flavor
_realname=flashcache
_name=$_realname-$_flavor
-_kver=4.1.20
+_kver=4.4.6
_kpkgrel=0
_realver=3.1.2
@@ -25,7 +25,7 @@ pkgver=$_kver
pkgrel=$(($_kpkgrel + $_mypkgrel))
pkgdesc="a general purpose writeback block cache for Linux"
url="https://github.com/facebook/flashcache/"
-arch="all"
+arch=""
license="GPL"
depends="linux-${_flavor}=${_kernelver}"
makedepends="linux-${_flavor}-dev=${_kernelver}"
@@ -35,6 +35,7 @@ subpackages=
source="$_realname-$_realver.tar.gz::https://github.com/facebook/flashcache/archive/$_realver.tar.gz
depmod.patch
kernel-3.18.patch
+ kernel-4.2.patch
"
@@ -65,10 +66,13 @@ package() {
md5sums="b569604f7efce881e87752c9efc01965 flashcache-3.1.2.tar.gz
ef9bd511f2b964bf22863814679bfba3 depmod.patch
-24462dd41268d045bd91ba88274115fb kernel-3.18.patch"
+24462dd41268d045bd91ba88274115fb kernel-3.18.patch
+29d3529370a569327a9a258f88dd30cc kernel-4.2.patch"
sha256sums="f1d97395c744850a909e5f57b69a0ce87c773f2761e0147dd78de5fec3ea61e2 flashcache-3.1.2.tar.gz
05c0fefaaaea624c12b9ff3e66e0029b8dcc0c0d3246e10683bf217e10b3c450 depmod.patch
-34a008e4c2382c757e030280fc6ce66c739251ca7883ef7d45feba44e2a05134 kernel-3.18.patch"
+34a008e4c2382c757e030280fc6ce66c739251ca7883ef7d45feba44e2a05134 kernel-3.18.patch
+cf21af11f507fe81094933e3c79379067661a32d834f2ac2378a4dd67f50d080 kernel-4.2.patch"
sha512sums="03d88b2622b7a41b66cd5cf4637be52c3bd6f25ac1099d7ea247e8e9bdad8a040bf0d10bcee2f49de8621f0da755dfd8a03810d709faaa330b78b6c564872e72 flashcache-3.1.2.tar.gz
55543347d76171352199294a29bcf19ba6b511f57e63c2a4254c4ebad8829912c65cdbef95bc7485d079dd66c56c1624b9570e7faf038cc5cb80e81079fcadc6 depmod.patch
-f09255bdc66711e35736a018f870b7a398bf05e3f1e8e4574a84967672152c510a4d6f8687ced49f52cfa63c57b407a393805e4df900de8ee6817e9c8c455306 kernel-3.18.patch"
+f09255bdc66711e35736a018f870b7a398bf05e3f1e8e4574a84967672152c510a4d6f8687ced49f52cfa63c57b407a393805e4df900de8ee6817e9c8c455306 kernel-3.18.patch
+82b1c885e2884a1ece0e003b726067ed0818f40f92689145b15aff1e15e14e5c34ed9b38f35010519d584dd5c6d5dda3393ed09d716bd1bf9aa4e85524fdd2a2 kernel-4.2.patch"
diff --git a/testing/flashcache-grsec/kernel-4.2.patch b/testing/flashcache-grsec/kernel-4.2.patch
new file mode 100644
index 0000000000..7f2b5c6e01
--- /dev/null
+++ b/testing/flashcache-grsec/kernel-4.2.patch
@@ -0,0 +1,36 @@
+From 0feecf4de9d94cd903a7db373b8cd5cb0eef1987 Mon Sep 17 00:00:00 2001
+From: Vinson Lee <vlee@twitter.com>
+Date: Wed, 1 Jul 2015 14:12:47 -0700
+Subject: [PATCH] Fix Linux 4.2 compilation errors.
+
+Signed-off-by: Vinson Lee <vlee@twitter.com>
+---
+ src/flashcache_conf.c | 1 +
+ src/flashcache_kcopy.c | 1 +
+ src/flashcache_subr.c | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/flashcache_conf.c b/src/flashcache_conf.c
+index 43f4387..0ca05f7 100644
+--- a/src/flashcache_conf.c
++++ b/src/flashcache_conf.c
+@@ -41,6 +41,7 @@
+ #include <linux/delay.h>
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
++#include <linux/vmalloc.h>
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+ #include "dm.h"
+diff --git a/src/flashcache_subr.c b/src/flashcache_subr.c
+index 8d0bae5..ef931d4 100644
+--- a/src/flashcache_subr.c
++++ b/src/flashcache_subr.c
+@@ -41,6 +41,7 @@
+ #include <linux/time.h>
+ #include <asm/kmap_types.h>
+ #include <linux/jhash.h>
++#include <linux/vmalloc.h>
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+ #include "dm.h"