diff options
author | Shea Levy <shea@shealevy.com> | 2011-09-28 21:09:54 +0000 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2011-09-28 21:09:54 +0000 |
commit | 2e012018bb4a457fde7d660a8c195db4c247da72 (patch) | |
tree | 6468ec18148b1390e8889a678e7298f0fee6af3a /pkgs/os-specific/linux/kernel/patches.nix | |
parent | 60b155479dda13aebe5bd431e031b1ce86cf90a4 (diff) | |
download | nixpkgs-2e012018bb4a457fde7d660a8c195db4c247da72.tar nixpkgs-2e012018bb4a457fde7d660a8c195db4c247da72.tar.gz nixpkgs-2e012018bb4a457fde7d660a8c195db4c247da72.tar.bz2 nixpkgs-2e012018bb4a457fde7d660a8c195db4c247da72.tar.lz nixpkgs-2e012018bb4a457fde7d660a8c195db4c247da72.tar.xz nixpkgs-2e012018bb4a457fde7d660a8c195db4c247da72.tar.zst nixpkgs-2e012018bb4a457fde7d660a8c195db4c247da72.zip |
makeAufs3StandalonePatch: Don't unpack the kernel source
svn path=/nixpkgs/trunk/; revision=29533
Diffstat (limited to 'pkgs/os-specific/linux/kernel/patches.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 98e8b41d22d..3f66fcb8850 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -36,7 +36,7 @@ let }; }; - makeAufs3StandalonePatch = {kernelSrc, version, rev, sha256}: + makeAufs3StandalonePatch = {version, rev, sha256}: stdenv.mkDerivation { name = "aufs3-standalone-${version}.patch"; @@ -46,25 +46,11 @@ let inherit sha256 rev; }; - #Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4 - buildPhase = '' - tar xvf ${kernelSrc} - mv -v linux* a - cp -av a b - cd b - patch -Np1 -i ../aufs3-kbuild.patch - patch -Np1 -i ../aufs3-base.patch - patch -Np1 -i ../aufs3-proc_map.patch - patch -Np1 -i ../aufs3-standalone.patch - cp -av ../{Documentation,fs} . - cp -av ../include/linux/aufs_type.h include/linux/aufs_type.h - ''; + phases = [ "unpackPhase" "installPhase" ]; + #Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4 installPhase = '' - cd .. - set +e - diff -Naur a b > $out - set -e + cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out ''; }; @@ -304,10 +290,9 @@ rec { features.aufs2_1 = true; }; - aufs3_0 = kernelSrc: + aufs3_0 = { name = "aufs3.0"; patch = makeAufs3StandalonePatch { - inherit kernelSrc; version = "3.0"; rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4"; sha256 = "b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d"; |