BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #2090: add new lockdep tool from Linux 3.14

Browse source
This commit is contained in:
Vladimír Čunát 2014-04-02 20:53:56 +02:00
commit 8146737127
4 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/os-specific/linux/kernel/linux-3.11.nix
View file

@ -1,17 +0,0 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.11.10";
extraMeta.branch = "3.11";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "00g4rbkjsmyzzm9zmdll8qqs1mffa0pybwjpn9jnli2kgh9inzyb";
};
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
})

25
pkgs/os-specific/linux/kernel/lockdep.nix Normal file
View file

@ -0,0 +1,25 @@
{ stdenv, kernel }:
assert stdenv.lib.versionAtLeast kernel.version "3.14";
stdenv.mkDerivation {
name = "lockdep-linux-${kernel.version}";
inherit (kernel) src patches;
preConfigure = "cd tools/lib/lockdep";
installPhase = ''
mkdir -p $out/bin $out/lib $out/include
cp -R include/liblockdep $out/include
make install DESTDIR=$out prefix=""
substituteInPlace $out/bin/lockdep --replace "./liblockdep.so" "$out/lib/liblockdep.so"
'';
meta = {
description = "User-space locking validation via the kernel";
homepage = "https://kernel.org/";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}

1
pkgs/os-specific/linux/kernel/manual-config.nix
View file

@ -198,6 +198,7 @@ let
repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;
maintainers = [
maintainers.shlevy
maintainers.thoughtpolice
];
platforms = platforms.linux;
};

16
pkgs/top-level/all-packages.nix
View file

@ -6874,7 +6874,7 @@ let
# config options you need (e.g. by overriding extraConfig). See list of options here:
# https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
linux_3_2_grsecurity = lowPrio (lib.addMetaAttrs {
maintainers = with lib.maintainers; [ wizeman ];
maintainers = with lib.maintainers; [ wizeman thoughtpolice ];
} (lib.overrideDerivation (linux_3_2.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_56 kernelPatches.grsec_path ];
argsOverride = {
@ -6883,7 +6883,7 @@ let
})) (args: grsecurityOverrider args)));
linux_3_13_grsecurity = lowPrio (lib.addMetaAttrs {
maintainers = with lib.maintainers; [ wizeman ];
maintainers = with lib.maintainers; [ wizeman thoughtpolice ];
} (lib.overrideDerivation (linux_3_13.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_8 kernelPatches.grsec_path ];
argsOverride = {
@ -6943,15 +6943,6 @@ let
'';
});
linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};
linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
@ -7042,6 +7033,8 @@ let
perf = callPackage ../os-specific/linux/kernel/perf.nix { };
lockdep = callPackage ../os-specific/linux/kernel/lockdep.nix { };
psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { };
spl = callPackage ../os-specific/linux/spl/default.nix { };
@ -7071,7 +7064,6 @@ let
linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi;
linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;
linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11);
linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
linuxPackages_3_13_grsecurity = linuxPackagesFor pkgs.linux_3_13_grsecurity linuxPackages_3_13_grsecurity;
linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13);