diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-06-04 14:37:53 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-06-04 14:37:53 +0200 |
| commit | b15389e15958dcfdd6a321ab635233b74b9ea630 (patch) | |
| tree | 741a5ce390bb3915a7dca3c52ed8343ded5cd111 /gnu | |
| parent | 67dfa1986d7e8af9a42ffa7c9d2b40599857cf19 (diff) | |
| download | patches-b15389e15958dcfdd6a321ab635233b74b9ea630.tar patches-b15389e15958dcfdd6a321ab635233b74b9ea630.tar.gz | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/linux.scm | 22 | ||||
| -rw-r--r-- | 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 2232e8611e..262c5bdb34 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 88fad0e604..9eb868a118 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 <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; ;;; 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 |