diff options
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-3.2.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.2.nix | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index ae065499c658..13205e048ca6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,27 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.52"; + version = "3.2.62"; + extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1wpr5xs6vg0xjlzrlbkv7bjvv34psw57crkdh4lybghi4rgrmkzl"; + sha256 = "1yrmar14p5y9xaj9df388xwjmwz8fnsxnid6rkxxk7dni5di8nqf"; }; - features.iwlwifi = true; -}) + # We don't provide these patches if grsecurity is enabled, because + # the grsec 3.2 -stable patchset already includes them. + kernelPatches = args.kernelPatches ++ ( + stdenv.lib.optionals (!(args.features.grsecurity or false)) + [ { name = "0001-AppArmor-compatibility-patch-for-v5-network-controll"; + patch = ./apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch; + } + { name = "0002-AppArmor-compatibility-patch-for-v5-interface"; + patch = ./apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch; + } + { name = "0003-AppArmor-Allow-dfa-backward-compatibility-with-broke"; + patch = ./apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch; + }]); + + features.iwlwifi = true; +} // (args.argsOverride or {})) |