From 039b1414711bcf57fb46bfef4635b749aca0fc28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Nov 2006 08:32:23 +0000
Subject: [PATCH] * Generate a modules.dep containing correct paths.

svn path=/nixpkgs/trunk/; revision=6935
---
 pkgs/os-specific/linux/kernel/builder.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 0055b6f0077..9550770c9f6 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -33,8 +33,12 @@ installPhase() {
         
 	make install
 
-        export MODULE_DIR=$out/lib/modules
-	make modules_install DEPMOD=$module_init_tools/sbin/depmod
+        # Install the modules in $out/lib/modules with matching paths
+        # in modules.dep (i.e., refererring to $out/lib/modules, not
+        # /lib/modules).  The depmod_opts= is to prevent the kernel
+        # from passing `-b PATH' to depmod.
+        export MODULE_DIR=$out/lib/modules/
+	make modules_install DEPMOD=$module_init_tools/sbin/depmod depmod_opts=
 
         # Strip the kernel modules.
         echo "Stripping kernel modules..."