Author: shlevy
Date: Wed Sep 28 21:09:54 2011
New Revision: 29533
URL: https://ssl.nixos.org/websvn/nix/?rev=29533&sc=1
Log:
makeAufs3StandalonePatch: Don't unpack the kernel source
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Wed Sep 28
20:48:08 2011 (r29532)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Wed Sep 28
21:09:54 2011 (r29533)
@@ -36,7 +36,7 @@
};
};
- makeAufs3StandalonePatch = {kernelSrc, version, rev, sha256}:
+ makeAufs3StandalonePatch = {version, rev, sha256}:
stdenv.mkDerivation {
name = "aufs3-standalone-${version}.patch";
@@ -46,25 +46,11 @@
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 @@
features.aufs2_1 = true;
};
- aufs3_0 = kernelSrc:
+ aufs3_0 =
{ name = "aufs3.0";
patch = makeAufs3StandalonePatch {
- inherit kernelSrc;
version = "3.0";
rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4";
sha256 =
"b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Sep 28 20:48:08
2011 (r29532)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Sep 28 21:09:54
2011 (r29533)
@@ -5550,7 +5550,7 @@
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
- (kernelPatches.aufs3_0 linux_3_0.src)
+ kernelPatches.aufs3_0
#kernelPatches.aufs2_1_3_0
#kernelPatches.mips_restart_2_6_36
];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
