diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-12-11 12:55:16 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-12-11 13:01:25 +0000 |
commit | 8855263e6d613529825e813844018363680dbd51 (patch) | |
tree | ce7c31e29382cadd91d255b67b1a772698c6a2ef | |
parent | 4f72a7aa691a4c1edb69361b4d35c7466751f585 (diff) | |
download | alpine_aports-8855263e6d613529825e813844018363680dbd51.tar.bz2 alpine_aports-8855263e6d613529825e813844018363680dbd51.tar.xz alpine_aports-8855263e6d613529825e813844018363680dbd51.zip |
testing/zfs-grsec: rebuild against kernel 3.12.4-r0
-rw-r--r-- | testing/zfs-grsec/APKBUILD | 15 | ||||
-rw-r--r-- | testing/zfs-grsec/linux-3.11-lz4-compat.patch | 72 |
2 files changed, 82 insertions, 5 deletions
diff --git a/testing/zfs-grsec/APKBUILD b/testing/zfs-grsec/APKBUILD index 1c325eaa1e..6586b1160a 100644 --- a/testing/zfs-grsec/APKBUILD +++ b/testing/zfs-grsec/APKBUILD | |||
@@ -6,7 +6,7 @@ _realname=zfs | |||
6 | _name=$_realname-$_flavor | 6 | _name=$_realname-$_flavor |
7 | 7 | ||
8 | _kpkg=linux-$_flavor | 8 | _kpkg=linux-$_flavor |
9 | _kver=3.10.23 | 9 | _kver=3.12.4 |
10 | _kpkgrel=0 | 10 | _kpkgrel=0 |
11 | 11 | ||
12 | _realver=0.6.2 | 12 | _realver=0.6.2 |
@@ -36,7 +36,9 @@ makedepends="$depends_dev automake autoconf libtool" | |||
36 | install="" | 36 | install="" |
37 | subpackages="$pkgname-dev $pkgname-utils" | 37 | subpackages="$pkgname-dev $pkgname-utils" |
38 | source="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-$_realver.tar.gz | 38 | source="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-$_realver.tar.gz |
39 | timestamp.patch" | 39 | timestamp.patch |
40 | linux-3.11-lz4-compat.patch | ||
41 | " | ||
40 | 42 | ||
41 | _builddir="$srcdir/$_realname-$_realver" | 43 | _builddir="$srcdir/$_realname-$_realver" |
42 | 44 | ||
@@ -100,8 +102,11 @@ utils() { | |||
100 | } | 102 | } |
101 | 103 | ||
102 | md5sums="0b183b0abdd5be287046ad9ce4f899fd zfs-0.6.2.tar.gz | 104 | md5sums="0b183b0abdd5be287046ad9ce4f899fd zfs-0.6.2.tar.gz |
103 | 9621735b802e34d792b03ef89727f6ea timestamp.patch" | 105 | 9621735b802e34d792b03ef89727f6ea timestamp.patch |
106 | 6b7ba7ef84f80e3ea18d5bbc7006f15d linux-3.11-lz4-compat.patch" | ||
104 | sha256sums="6b8cd79486b3a51204fac07297b8c45aa8702b8dfade58f2098b5734517065a1 zfs-0.6.2.tar.gz | 107 | sha256sums="6b8cd79486b3a51204fac07297b8c45aa8702b8dfade58f2098b5734517065a1 zfs-0.6.2.tar.gz |
105 | 74924b471c2a83831f274b876c1d4f293f1e142089f34fccd19ae60b59066661 timestamp.patch" | 108 | 74924b471c2a83831f274b876c1d4f293f1e142089f34fccd19ae60b59066661 timestamp.patch |
109 | 2c1b9c509b8cbf71cc28b77758b290ddef547e0499876cb3103f0b2331409ec3 linux-3.11-lz4-compat.patch" | ||
106 | sha512sums="bb0615ce3407bf3457bdc6843d444bb38dea978709b10dae892279a9608ca964c4f8f37a18c21b059c84b67973f2be9a41b1dac2e3c6b0cdbbd577b62d3e9916 zfs-0.6.2.tar.gz | 110 | sha512sums="bb0615ce3407bf3457bdc6843d444bb38dea978709b10dae892279a9608ca964c4f8f37a18c21b059c84b67973f2be9a41b1dac2e3c6b0cdbbd577b62d3e9916 zfs-0.6.2.tar.gz |
107 | 2cb675e4603ea4aa951c7da2c57374bb404d52ee4fd04c719479ff07a3cf50c1d6f4b7cd2398c20327127fe81d47fcfa2ed95d18f05acd59f1ee8115334aabd2 timestamp.patch" | 111 | 2cb675e4603ea4aa951c7da2c57374bb404d52ee4fd04c719479ff07a3cf50c1d6f4b7cd2398c20327127fe81d47fcfa2ed95d18f05acd59f1ee8115334aabd2 timestamp.patch |
112 | 59569dd5cdc04a2aa9cb48a8533cf63b0e07ff348cb6a1291a8acd03a75058ca0af23837416d0cfb214edc4fde40ed2e3d0bea2e1b94dad1457e86e95cec6b11 linux-3.11-lz4-compat.patch" | ||
diff --git a/testing/zfs-grsec/linux-3.11-lz4-compat.patch b/testing/zfs-grsec/linux-3.11-lz4-compat.patch new file mode 100644 index 0000000000..88d415e885 --- /dev/null +++ b/testing/zfs-grsec/linux-3.11-lz4-compat.patch | |||
@@ -0,0 +1,72 @@ | |||
1 | From b3c49d3df82466646bde9beebce7bbf0b3c41853 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Yao <ryao@gentoo.org> | ||
3 | Date: Sat, 5 Oct 2013 17:55:24 -0400 | ||
4 | Subject: [PATCH] Linux 3.11 compat: Rename LZ4 symbols | ||
5 | |||
6 | Linus Torvalds merged LZ4 into Linux 3.11. This causes a conflict | ||
7 | whenever CONFIG_LZ4_DECOMPRESS=y or CONFIG_LZ4_COMPRESS=y are set in the | ||
8 | kernel's .config. We rename the symbols to avoid the conflict. | ||
9 | |||
10 | Signed-off-by: Richard Yao <ryao@gentoo.org> | ||
11 | Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> | ||
12 | Closes #1789 | ||
13 | --- | ||
14 | include/sys/zio_compress.h | 4 ++-- | ||
15 | module/zfs/lz4.c | 4 ++-- | ||
16 | module/zfs/zio_compress.c | 2 +- | ||
17 | 3 files changed, 5 insertions(+), 5 deletions(-) | ||
18 | |||
19 | diff --git a/include/sys/zio_compress.h b/include/sys/zio_compress.h | ||
20 | index bd051f1..e4b565d 100644 | ||
21 | --- a/include/sys/zio_compress.h | ||
22 | +++ b/include/sys/zio_compress.h | ||
23 | @@ -74,9 +74,9 @@ extern size_t zle_compress(void *src, void *dst, size_t s_len, size_t d_len, | ||
24 | int level); | ||
25 | extern int zle_decompress(void *src, void *dst, size_t s_len, size_t d_len, | ||
26 | int level); | ||
27 | -extern size_t lz4_compress(void *src, void *dst, size_t s_len, size_t d_len, | ||
28 | +extern size_t lz4_compress_zfs(void *src, void *dst, size_t s_len, size_t d_len, | ||
29 | int level); | ||
30 | -extern int lz4_decompress(void *src, void *dst, size_t s_len, size_t d_len, | ||
31 | +extern int lz4_decompress_zfs(void *src, void *dst, size_t s_len, size_t d_len, | ||
32 | int level); | ||
33 | |||
34 | /* | ||
35 | diff --git a/module/zfs/lz4.c b/module/zfs/lz4.c | ||
36 | index 8afaad1..ae5d5a2 100644 | ||
37 | --- a/module/zfs/lz4.c | ||
38 | +++ b/module/zfs/lz4.c | ||
39 | @@ -47,7 +47,7 @@ static int LZ4_compress64kCtx(void *ctx, const char *source, char *dest, | ||
40 | |||
41 | /*ARGSUSED*/ | ||
42 | size_t | ||
43 | -lz4_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n) | ||
44 | +lz4_compress_zfs(void *s_start, void *d_start, size_t s_len, size_t d_len, int n) | ||
45 | { | ||
46 | uint32_t bufsiz; | ||
47 | char *dest = d_start; | ||
48 | @@ -74,7 +74,7 @@ static int LZ4_compress64kCtx(void *ctx, const char *source, char *dest, | ||
49 | |||
50 | /*ARGSUSED*/ | ||
51 | int | ||
52 | -lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n) | ||
53 | +lz4_decompress_zfs(void *s_start, void *d_start, size_t s_len, size_t d_len, int n) | ||
54 | { | ||
55 | const char *src = s_start; | ||
56 | uint32_t bufsiz = BE_IN32(src); | ||
57 | diff --git a/module/zfs/zio_compress.c b/module/zfs/zio_compress.c | ||
58 | index 1dc780d..5864d5c 100644 | ||
59 | --- a/module/zfs/zio_compress.c | ||
60 | +++ b/module/zfs/zio_compress.c | ||
61 | @@ -53,7 +53,7 @@ | ||
62 | {gzip_compress, gzip_decompress, 8, "gzip-8"}, | ||
63 | {gzip_compress, gzip_decompress, 9, "gzip-9"}, | ||
64 | {zle_compress, zle_decompress, 64, "zle"}, | ||
65 | - {lz4_compress, lz4_decompress, 0, "lz4"}, | ||
66 | + {lz4_compress_zfs, lz4_decompress_zfs, 0, "lz4"}, | ||
67 | }; | ||
68 | |||
69 | enum zio_compress | ||
70 | -- | ||
71 | 1.8.5.1 | ||
72 | |||