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

apparmor: Update to kernel 3.4 series (the current default)

Browse Source
This commit is contained in:
Ricardo M. Correia 2013-07-21 02:14:16 +00:00 committed by Bjørn Forsman
parent b52621a5fe
commit 22689567ed
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -55,6 +55,13 @@ rec {
features.apparmor = true; features.apparmor = true;
}; };
apparmor_3_4 = rec {
version = "3.4";
name = "apparmor-${version}";
patch = makeAppArmorPatch { inherit apparmor version; };
features.apparmor = true;
};
sec_perm_2_6_24 = sec_perm_2_6_24 =
{ name = "sec_perm-2.6.24"; { name = "sec_perm-2.6.24";
patch = ./sec_perm-2.6.24.patch; patch = ./sec_perm-2.6.24.patch;

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

@ -6373,6 +6373,14 @@ let
]; ];
}; };
linux_3_4_apparmor = 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) { linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
}; };
@ -6534,6 +6542,7 @@ let
linuxPackages_3_2_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor); linuxPackages_3_2_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor);
linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen); linuxPackages_3_2_xen = recurseIntoAttrs (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 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
linuxPackages_3_4_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor);
linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8); linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9);