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

gnu: busybox: Return #t from all phases. 

* gnu/packages/busybox.scm (busybox)[arguments]: Substitute INVOKE for
SYSTEM*.
This commit is contained in:
Tobias Geerinckx-Rice 2018-06-22 17:17:29 +02:00
parent 5b34f56c1d
commit f7705d4cb8
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/busybox.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -44,7 +45,7 @@
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda _ (zero? (system* "make" "defconfig")))) (lambda _ (invoke "make" "defconfig")))
(replace 'check (replace 'check
(lambda _ (lambda _
(substitute* '("testsuite/du/du-s-works" (substitute* '("testsuite/du/du-s-works"
@ -71,18 +72,17 @@
(delete-file "testsuite/which/which-uses-default-path") (delete-file "testsuite/which/which-uses-default-path")
(rmdir "testsuite/which") (rmdir "testsuite/which")
(zero? (system* "make" (invoke "make"
;; "V=1" ;; "V=1"
"SKIP_KNOWN_BUGS=1" "SKIP_KNOWN_BUGS=1"
"SKIP_INTERNET_TESTS=1" "SKIP_INTERNET_TESTS=1"
"check")))) "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")))
(zero? (invoke "make"
(system* "make" (string-append "CONFIG_PREFIX=" out)
(string-append "CONFIG_PREFIX=" out) "install")))))))
"install"))))))))
(native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man) (native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man)
;; The following are needed by the tests. ;; The following are needed by the tests.
("inetutils" ,inetutils) ("inetutils" ,inetutils)