diff options
author | Austin Seipp <aseipp@pobox.com> | 2014-05-07 17:59:29 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2014-05-17 14:09:09 -0500 |
commit | 92abc4c61088c561a0060219cc95da5eaf79a857 (patch) | |
tree | e6a361b86b448580f7d20cdde501a9feb9799408 /pkgs/top-level | |
parent | 3efdeef6a31dca9dc7e76afd575fa43e78d6afea (diff) | |
download | nixlib-92abc4c61088c561a0060219cc95da5eaf79a857.tar nixlib-92abc4c61088c561a0060219cc95da5eaf79a857.tar.gz nixlib-92abc4c61088c561a0060219cc95da5eaf79a857.tar.bz2 nixlib-92abc4c61088c561a0060219cc95da5eaf79a857.tar.lz nixlib-92abc4c61088c561a0060219cc95da5eaf79a857.tar.xz nixlib-92abc4c61088c561a0060219cc95da5eaf79a857.tar.zst nixlib-92abc4c61088c561a0060219cc95da5eaf79a857.zip |
kernel: enable AppArmor by default
AppArmor only requires a few patches to the 3.2 and 3.4 kernels in order to work properly (with the minor catch grsecurity -stable includes the 3.2 patches.) This adds them to the kernel builds by default, removes features.apparmor (since it's always true) and makes it the default MAC system. Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a61d064bf2e..77af3087b3d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7064,14 +7064,6 @@ let kernelPatches = []; }; - linux_3_2_apparmor = lowPrio (linux_3_2.override { - kernelPatches = [ kernelPatches.apparmor_3_2 ]; - extraConfig = '' - SECURITY_APPARMOR y - DEFAULT_SECURITY_APPARMOR y - ''; - }); - linux_3_2_xen = lowPrio (linux_3_2.override { extraConfig = '' XEN_DOM0 y @@ -7086,14 +7078,6 @@ let ]; }; - linux_3_4_apparmor = lowPrio (linux_3_4.override { - kernelPatches = [ kernelPatches.apparmor_3_4 ]; - extraConfig = '' - SECURITY_APPARMOR y - DEFAULT_SECURITY_APPARMOR y - ''; - }); - linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { inherit fetchurl stdenv perl buildLinux; }; @@ -7233,10 +7217,8 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); - linuxPackages_3_2_apparmor = linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor; linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen; linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); - linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor; 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; |