Merging from trunk.

I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438

1 files changed, 6 insertions, 1 deletions

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 5718d06c45d2..5b37f9908c24 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -200,12 +200,17 @@ rec {
         # Get rid of everything that isn't a gcno file or a C source
         # file.  This also includes the gcda files; we're not
         # interested in coverage resulting from the package's own test
-        # suite.
+        # suite.  Also strip the `.tmp_' prefix from gcno files.  (The
+        # Linux kernel creates these.)
         cleanupBuildDir =
           ''
             find $out/.build/ -type f -a ! \
               \( -name "*.c" -o -name "*.h" -o -name "*.gcno" \) \
               | xargs rm -f --
+
+            for i in $(find $out/.build/ -name ".tmp_*.gcno"); do 
+                mv "$i" "$(echo $i | sed s/.tmp_//)"
+            done
           '';
       } stdenv;