public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1010 from offlinehacker.

Browse Source 
Although this is a release canidate version of kernel 3.12, there are
reasons for merging this anyway, as discussed in #1010 and #1006.

Thanks to @offlinehacker for this and the initial pull request.
This commit is contained in:
aszlig 2013-09-25 14:05:33 +02:00
commit 2e89b40634
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -169,6 +169,9 @@ with stdenv.lib;
SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
DEVKMEM n # Disable /dev/kmem DEVKMEM n # Disable /dev/kmem
CC_STACKPROTECTOR y # Detect buffer overflows on the stack CC_STACKPROTECTOR y # Detect buffer overflows on the stack
${optionalString (versionAtLeast version "3.12") ''
USER_NS y # Support for user namespaces
''}
# Misc. options. # Misc. options.
8139TOO_8129 y 8139TOO_8129 y

16
pkgs/os-specific/linux/kernel/linux-3.12.nix Normal file
View File

@ -0,0 +1,16 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.12-rc2";
src = fetchurl {
url = "https://www.kernel.org/pub/linux/kernel/v3.0/testing/linux-${version}.tar.gz";
sha256 = "1m24fh3cwmkb1scn3sl7gbc50jl53v357kjpgda9avi3ljxmyq5z";
};
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
})

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

@ -6574,6 +6574,19 @@ let
]; ];
}; };
linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) {
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};
/* Linux kernel modules are inherently tied to a specific kernel. So /* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a rather than provide specific instances of those packages for a
specific kernel, we have a function that builds those packages specific kernel, we have a function that builds those packages
@ -6696,6 +6709,7 @@ let
linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9);
linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11);
linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
# Update this when adding a new version! # Update this when adding a new version!
linuxPackages_latest = pkgs.linuxPackages_3_11; linuxPackages_latest = pkgs.linuxPackages_3_11;