diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-08 23:13:18 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-08 23:13:18 +0000 |
| commit | e32787dc9470eabaf2f5fe8f4572402cf3aadd21 (patch) | |
| tree | 119095c57a2f596c5aa5f3c9b40120d719399fc5 | |
| parent | b9681bf5aa0dfe2f3efe15160af33f008c42b568 (diff) | |
| download | nixlib-e32787dc9470eabaf2f5fe8f4572402cf3aadd21.tar nixlib-e32787dc9470eabaf2f5fe8f4572402cf3aadd21.tar.gz nixlib-e32787dc9470eabaf2f5fe8f4572402cf3aadd21.tar.bz2 nixlib-e32787dc9470eabaf2f5fe8f4572402cf3aadd21.tar.lz nixlib-e32787dc9470eabaf2f5fe8f4572402cf3aadd21.tar.xz nixlib-e32787dc9470eabaf2f5fe8f4572402cf3aadd21.tar.zst nixlib-e32787dc9470eabaf2f5fe8f4572402cf3aadd21.zip | |
* Fix AEFS on x86_64.
svn path=/nixpkgs/trunk/; revision=10561
| -rw-r--r-- | pkgs/os-specific/linux/aufs/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/aufs/default.nix b/pkgs/os-specific/linux/aufs/default.nix index c053a8073073..2ce510a5b9b8 100644 --- a/pkgs/os-specific/linux/aufs/default.nix +++ b/pkgs/os-specific/linux/aufs/default.nix @@ -9,12 +9,15 @@ stdenv.mkDerivation { }; buildPhase = '' - mkdir kernelsrc - tar xvf ${kernel.src} -C kernelsrc - + kernelVersion=$(cd ${kernel}/lib/modules && ls) - substituteInPlace fs/aufs/Makefile --replace srctree srctree2 - make KDIR=${kernel}/lib/modules/$kernelVersion/build srctree2=$(pwd)/kernelsrc/* -f local.mk + kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/source) + tar xvfj ${kernel.src} + kernelSource=$(echo $(pwd)/linux-*) + cp -prd $kernelBuild/* $kernelSource + + substituteInPlace fs/aufs/Makefile + make KDIR=$kernelSource -f local.mk ''; installPhase = '' |