ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

spl: Modularize and create a userspace only package

Browse Source
This commit is contained in:
William A. Kennington III 2015-02-07 14:32:35 -08:00
parent 236029ef83
commit 91e6126a32
4 changed files with 82 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/os-specific/linux/spl/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, kernel, perl, autoconf, automake, libtool, coreutils, gawk }:
{ callPackage, fetchFromGitHub, ... } @ args:
stdenv.mkDerivation rec {
name = "spl-${version}-${kernel.version}";
callPackage ./generic.nix (args // rec {
version = "0.6.3-1.2";
src = fetchFromGitHub {
@ -12,38 +11,4 @@ stdenv.mkDerivation rec {
};
patches = [ ./install_prefix.patch ./const.patch ./time.patch ];
buildInputs = [ perl autoconf automake libtool ];
preConfigure = ''
./autogen.sh
substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod
substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
'';
configureFlags = ''
--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source
--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
'';
enableParallelBuilding = true;
meta = {
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
longDescription = ''
This kernel module is a porting layer for ZFS to work inside the linux
kernel.
'';
homepage = http://zfsonlinux.org/;
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ jcumming wizeman ];
};
}
})

60
pkgs/os-specific/linux/spl/generic.nix Normal file
View File

@ -0,0 +1,60 @@
{ stdenv, autoconf, automake, libtool, coreutils, gawk
, configFile ? "all"
# Kernel dependencies
, kernel ? null
# Version specific parameters
, version, src, patches
, ...
}:
with stdenv.lib;
let
needsKernelSource = any (n: n == configFile) [ "kernel" "all" ];
in
assert any (n: n == configFile) [ "kernel" "user" "all" ];
assert needsKernelSource -> kernel != null;
stdenv.mkDerivation rec {
name = "spl-${configFile}-${version}${optionalString needsKernelSource "-${kernel.version}"}";
inherit version src patches;
buildInputs = [ autoconf automake libtool ];
preConfigure = ''
./autogen.sh
substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod
substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
'';
configureFlags = [
"--with-config=${configFile}"
] ++ optionals needsKernelSource [
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
enableParallelBuilding = true;
meta = {
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
longDescription = ''
This kernel module is a porting layer for ZFS to work inside the linux
kernel.
'';
homepage = http://zfsonlinux.org/;
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jcumming wizeman wkennington ];
};
}

42
pkgs/os-specific/linux/spl/git.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit, kernel, perl, autoconf, automake, libtool, coreutils, gawk }:
{ callPackage, fetchgit, ... } @ args:
stdenv.mkDerivation {
name = "spl-0.6.4-${kernel.version}";
callPackage ./generic.nix (args // rec {
version = "086476f";
src = fetchgit {
url = git://github.com/zfsonlinux/spl.git;
@ -10,38 +10,4 @@ stdenv.mkDerivation {
};
patches = [ ./const.patch ./install_prefix-git.patch ];
buildInputs = [ perl autoconf automake libtool ];
preConfigure = ''
./autogen.sh
substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod
substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
'';
configureFlags = [
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
enableParallelBuilding = true;
meta = {
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
longDescription = ''
This kernel module is a porting layer for ZFS to work inside the linux
kernel.
'';
homepage = http://zfsonlinux.org/;
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ wizeman ];
};
}
})

17
pkgs/top-level/all-packages.nix
View File

@ -8774,8 +8774,14 @@ let
seturgent = callPackage ../os-specific/linux/seturgent { };
spl = callPackage ../os-specific/linux/spl { };
spl_git = callPackage ../os-specific/linux/spl/git.nix { };
spl = callPackage ../os-specific/linux/spl {
configFile = "kernel";
inherit kernel;
};
spl_git = callPackage ../os-specific/linux/spl/git.nix {
configFile = "kernel";
inherit kernel;
};
sysdig = callPackage ../os-specific/linux/sysdig {};
@ -9013,6 +9019,13 @@ let
statifier = builderDefsPackage (import ../os-specific/linux/statifier) { };
spl = callPackage ../os-specific/linux/spl {
configFile = "user";
};
spl_git = callPackage ../os-specific/linux/spl/git.nix {
configFile = "user";
};
sysdig = callPackage ../os-specific/linux/sysdig {
kernel = null;
}; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor