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

makeAufs3StandalonePatch: Don't unpack the kernel source

Browse Source 
svn path=/nixpkgs/trunk/; revision=29533
This commit is contained in:
Shea Levy 2011-09-28 21:09:54 +00:00
parent 60b155479d
commit 2e012018bb
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ let
}; };
}; };
makeAufs3StandalonePatch = {kernelSrc, version, rev, sha256}: makeAufs3StandalonePatch = {version, rev, sha256}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "aufs3-standalone-${version}.patch"; name = "aufs3-standalone-${version}.patch";
@ -46,25 +46,11 @@ let
inherit sha256 rev; 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 phases = [ "unpackPhase" "installPhase" ];
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
'';
#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 = '' installPhase = ''
cd .. cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out
set +e
diff -Naur a b > $out
set -e
''; '';
}; };
@ -304,10 +290,9 @@ rec {
features.aufs2_1 = true; features.aufs2_1 = true;
}; };
aufs3_0 = kernelSrc: aufs3_0 =
{ name = "aufs3.0"; { name = "aufs3.0";
patch = makeAufs3StandalonePatch { patch = makeAufs3StandalonePatch {
inherit kernelSrc;
version = "3.0"; version = "3.0";
rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4"; rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4";
sha256 = "b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d"; sha256 = "b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d";

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

@ -5550,7 +5550,7 @@ let
kernelPatches = kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38 [ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24 kernelPatches.sec_perm_2_6_24
(kernelPatches.aufs3_0 linux_3_0.src) kernelPatches.aufs3_0
#kernelPatches.aufs2_1_3_0 #kernelPatches.aufs2_1_3_0
#kernelPatches.mips_restart_2_6_36 #kernelPatches.mips_restart_2_6_36
]; ];