Add linux 3.14

This commit is contained in:
Shea Levy 2014-03-31 20:54:47 -04:00
parent 073eab850a
commit 2d4ce25b5b
3 changed files with 32 additions and 2 deletions

View file

@ -167,7 +167,9 @@ with stdenv.lib;
STRICT_DEVMEM y # Filter access to /dev/mem
SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
DEVKMEM n # Disable /dev/kmem
CC_STACKPROTECTOR y # Detect buffer overflows on the stack
${optionalString (versionOlder version "3.14") ''
CC_STACKPROTECTOR y # Detect buffer overflows on the stack
''}
${optionalString (versionAtLeast version "3.12") ''
USER_NS y # Support for user namespaces
''}

View file

@ -0,0 +1,18 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.14";
extraMeta.branch = "3.14";
modDirVersion = "3.14.0";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa";
};
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

View file

@ -6966,6 +6966,15 @@ let
];
};
linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.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 kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a
@ -7062,8 +7071,9 @@ let
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);
linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
# Update this when adding a new version!
linuxPackages_latest = pkgs.linuxPackages_3_13;
linuxPackages_latest = pkgs.linuxPackages_3_14;
# The current default kernel / kernel modules.
linux = linuxPackages.kernel;