06/08: gnu: linux-libre-headers: Do not retain reference to the bootstrap tools.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit b15389e15958dcfdd6a321ab635233b74b9ea630
Author: Ludovic Courtès <address@hidden>
Date:   Thu Jun 4 14:37:53 2015 +0200

    gnu: linux-libre-headers: Do not retain reference to the bootstrap tools.
    
    * gnu/packages/linux.scm (linux-libre-headers)[install-phase]: Remove
      ".install" files from the output.
      [arguments]: Add #:allowed-references.
---
 gnu/packages/linux.scm          |   22 ++++++++++++++++------
 gnu/packages/make-bootstrap.scm |    6 +-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 2232e86..262c5bd 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -106,12 +106,21 @@
                (and (zero? (system* "make"
                                     (string-append "INSTALL_HDR_PATH=" out)
                                     "headers_install"))
-                    (mkdir (string-append out "/include/config"))
-                    (call-with-output-file
-                        (string-append out
-                                       "/include/config/kernel.release")
-                      (lambda (p)
-                        (format p "~a-default~%" ,version))))))))
+                    (begin
+                      (mkdir (string-append out "/include/config"))
+                      (call-with-output-file
+                          (string-append out
+                                         "/include/config/kernel.release")
+                        (lambda (p)
+                          (format p "~a-default~%" ,version)))
+
+                      ;; Remove the '.install' and '..install.cmd' files; the
+                      ;; latter contains store paths, which pulls in bootstrap
+                      ;; binaries in the build environment, and prevents bit
+                      ;; reproducibility for the bootstrap binaries.
+                      (for-each delete-file (find-files out "\\.install"))
+
+                      #t))))))
    (package
     (name "linux-libre-headers")
     (version version)
@@ -133,6 +142,7 @@
                  (alist-replace
                   'install ,install-phase
                   (alist-delete 'configure %standard-phases)))
+       #:allowed-references ()
        #:tests? #f))
     (synopsis "GNU Linux-Libre kernel headers")
     (description "Headers of the Linux-Libre kernel.")
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 88fad0e..9eb868a 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -374,10 +374,6 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
              (copy-recursively (string-append linux "/include/asm-generic")
                                (string-append incdir "/asm-generic"))
 
-             ;; Remove the '.install' and '..install.cmd' files; the latter
-             ;; contains store paths, which prevents bit reproducibility.
-             (for-each delete-file (find-files incdir "\\.install"))
-
              #t))))
       (inputs `(("libc" ,(let ((target (%current-target-system)))
                            (if target