forked from mirrors/nixpkgs
linuxPackages.openafs: 1.6.21.1 -> 1.6.22.1 (fixes build with kernel >=4.14)
This commit is contained in:
parent
3eb311ebac
commit
cf199ff56c
|
@ -3,39 +3,19 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "openafs-${version}-${kernel.version}";
|
name = "openafs-${version}-${kernel.version}";
|
||||||
version = "1.6.21.1";
|
version = "1.6.22.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
|
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
|
||||||
sha256 = "0nisxnfl8nllcfmi7mxj1gngkpxd4jp1wapbkhz07qwqynq9dn5f";
|
sha256 = "19nfbksw7b34jc3mxjk7cbz26zg9k5myhzpv2jf0fnmznr47jqaw";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake flex yacc perl which ];
|
nativeBuildInputs = [ autoconf automake flex yacc perl which ] ++ kernel.moduleBuildDependencies;
|
||||||
|
|
||||||
buildInputs = [ ncurses ];
|
buildInputs = [ ncurses ];
|
||||||
|
|
||||||
hardeningDisable = [ "pic" ];
|
hardeningDisable = [ "pic" ];
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "fix-stdint-include.patch";
|
|
||||||
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=c193e5cba18273a062d4162118c7055b54f7eb5e";
|
|
||||||
sha256 = "1yc4gygcazwsslf6mzk1ai92as5jbsjv7212jcbb2dw83jydhc09";
|
|
||||||
})
|
|
||||||
# linux 4.14
|
|
||||||
(fetchpatch {
|
|
||||||
name = "test-for-__vfs_write-rather-than-__vfs_read.patch";
|
|
||||||
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=929e77a886fc9853ee292ba1aa52a920c454e94b";
|
|
||||||
sha256 = "0g4jxqzvyrjy2q7mhxc5ikhypj3ljw1wri4lipzm66crsvycp9x5";
|
|
||||||
})
|
|
||||||
# linux 4.14
|
|
||||||
(fetchpatch {
|
|
||||||
name = "use-kernel_read-kernel_write-when-__vfs-variants-are-unavailable.patch";
|
|
||||||
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=5ee516b3789d3545f3d78fb3aba2480308359945";
|
|
||||||
sha256 = "1vx55qb120y857mn1l00i58fj9cckschp86ch3g6hqrdc5q5bxv2";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
ln -s "${kernel.dev}/lib/modules/"*/build $TMP/linux
|
ln -s "${kernel.dev}/lib/modules/"*/build $TMP/linux
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue