nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: linux-libre-headers: Use invoke instead of system*. 

* gnu/packages/linux.scm (linux-libre-headers)[arguments]: Use invoke and
remove vestigial result code plumbing.
This commit is contained in:
Mark H Weaver 2018-03-16 02:03:26 -04:00
parent 20927c9331
commit 5dc9ded15d
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gnu/packages/linux.scm
View File

@ -184,29 +184,29 @@ defconfig. Return the appropriate make target if applicable, otherwise return
(%current-system))))) (%current-system)))))
(setenv "ARCH" arch) (setenv "ARCH" arch)
(format #t "`ARCH' set to `~a'~%" (getenv "ARCH")) (format #t "`ARCH' set to `~a'~%" (getenv "ARCH"))
(and (zero? (system* "make" defconfig)) (invoke "make" defconfig)
(zero? (system* "make" "mrproper" "headers_check")))))) (invoke "make" "mrproper" "headers_check"))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(and (zero? (system* "make" (invoke "make"
(string-append "INSTALL_HDR_PATH=" out) (string-append "INSTALL_HDR_PATH=" out)
"headers_install")) "headers_install")
(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 (mkdir (string-append out "/include/config"))
;; latter contains store paths, which pulls in bootstrap (call-with-output-file
;; binaries in the build environment, and prevents bit (string-append out
;; reproducibility for the bootstrap binaries. "/include/config/kernel.release")
(for-each delete-file (find-files out "\\.install")) (lambda (p)
(format p "~a-default~%" ,version)))
#t)))))) ;; 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))))
#:allowed-references () #:allowed-references ()
#:tests? #f)) #:tests? #f))
(home-page "https://www.gnu.org/software/linux-libre/") (home-page "https://www.gnu.org/software/linux-libre/")