* addCoverageInstrumentation: factor out the code that keeps the build

  tree under $out into a separate stdenv adapter named keepBuildTree.
* makeModulesClosure: support building an initrd for a kernel that has
  been compiled with coverage instrumentation.

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

2 files changed, 8 insertions, 1 deletions

diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix
index 7eac04819790..cc197edbef19 100644
--- a/pkgs/build-support/kernel/modules-closure.nix
+++ b/pkgs/build-support/kernel/modules-closure.nix
@@ -3,11 +3,13 @@
 # the modules identified by `rootModules', plus their dependencies.
 # Also generate an appropriate modules.dep.
 
-{stdenv, kernel, rootModules, module_init_tools, allowMissing ? false}:
+{ stdenv, kernel, nukeReferences, rootModules
+, module_init_tools, allowMissing ? false }:
 
 stdenv.mkDerivation {
   name = kernel.name + "-shrunk";
   builder = ./modules-closure.sh;
+  buildInputs = [nukeReferences];
   inherit kernel rootModules module_init_tools allowMissing;
   allowedReferences = ["out"];
 }
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh
index 035893ebd69f..e75ef927baae 100644
--- a/pkgs/build-support/kernel/modules-closure.sh
+++ b/pkgs/build-support/kernel/modules-closure.sh
@@ -29,6 +29,11 @@ for module in $closure; do
     mkdir -p $(dirname $target)
     echo $module
     cp $module $target
+    # If the kernel is compiled with coverage instrumentation, it
+    # contains the paths of the *.gcda coverage data output files
+    # (which it doesn't actually use...).  Get rid of them to prevent
+    # the whole kernel from being included in the initrd.
+    nuke-refs $target
     echo $target >> $out/insmod-list
 done