Fixing in general the module construction (there were wrong paths in modules/build). Now kqemu works well for me, for instance. I will take the commit back, if it annoys anyone.

svn path=/nixpkgs/trunk/; revision=14192

1 files changed, 1 insertions, 6 deletions

diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 4e3461cc25a..46c30f3f3af 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -124,12 +124,7 @@ installPhase() {
         # copy include files
         includeDir=$out/lib/modules/$version/build/include
         mkdir -p $includeDir
-        (cd include && cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm-generic $includeDir)
-        if test -e arch/$archDir/include/asm; then
-            cp -a arch/$archDir/include/asm $includeDir
-        else
-            cp -a include/asm-$archDir $includeDir/asm
-        fi
+        (cd include && cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm-generic asm asm-$archDir $includeDir)
     fi
 }