diff options
| author | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-05-11 08:44:30 +0300 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-05-11 08:50:34 +0300 |
| commit | 8d7e1a79cc07f742084c8f01b624a84391e43078 (patch) | |
| tree | b0114fd1d98adfce08a32e611bfeee75b952bbdb /pkgs | |
| parent | a9459797e226508707dd33b99bf52798784ea38b (diff) | |
| download | nixpkgs-8d7e1a79cc07f742084c8f01b624a84391e43078.tar nixpkgs-8d7e1a79cc07f742084c8f01b624a84391e43078.tar.gz nixpkgs-8d7e1a79cc07f742084c8f01b624a84391e43078.tar.bz2 nixpkgs-8d7e1a79cc07f742084c8f01b624a84391e43078.tar.lz nixpkgs-8d7e1a79cc07f742084c8f01b624a84391e43078.tar.xz nixpkgs-8d7e1a79cc07f742084c8f01b624a84391e43078.tar.zst nixpkgs-8d7e1a79cc07f742084c8f01b624a84391e43078.zip | |
AppArmor: add a sample patched kernel.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
2 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 0c5109c9834..70e7cb2a30f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit }: +{ stdenv, fetchurl, fetchgit, apparmor }: let @@ -36,10 +36,23 @@ let ''; }; + makeAppArmorPatch = {apparmor, version}: + stdenv.mkDerivation { + name = "apparmor-${version}.patch"; + phases = ["installPhase"]; + installPhase = '' + cat ${apparmor}/kernel-patches/${version}/* > $out + ''; + }; in rec { + apparmor_3_2 = { + features.apparmor = true; + patch = makeAppArmorPatch { version = "3.2"; inherit apparmor; }; + }; + sec_perm_2_6_24 = { name = "sec_perm-2.6.24"; patch = ./sec_perm-2.6.24.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c5a9acf358..6e31d304297 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5963,6 +5963,14 @@ let ]; }; + linux_3_2_apparmor = linux_3_2.override { + kernelPatches = [ kernelPatches.apparmor_3_2 ]; + extraConfig = '' + SECURITY_APPARMOR y + DEFAULT_SECURITY_APPARMOR y + ''; + }; + linux_3_2_xen = linux_3_2.override { extraConfig = '' XEN_DOM0 y @@ -6135,6 +6143,7 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); + 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_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); |