futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: busybox: Use 'modify-phases'.

Browse Source 
* gnu/packages/busybox.scm (busybox)[arguments]: Use 'modify-phases'.
This commit is contained in:
Efraim Flashner 2016-06-30 19:09:40 +03:00
parent 2e5505e5ea
commit 84d08af653
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
gnu/packages/busybox.scm
View File

@ -42,37 +42,36 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda _ (zero? (system* "make" "defconfig"))) (lambda _ (zero? (system* "make" "defconfig"))))
(alist-replace (replace 'check
'check (lambda _
(lambda _
(substitute* '("testsuite/du/du-s-works" (substitute* '("testsuite/du/du-s-works"
"testsuite/du/du-works") "testsuite/du/du-works")
(("/bin") "/etc")) ; there is no /bin but there is a /etc (("/bin") "/etc")) ; there is no /bin but there is a /etc
;; There is no /usr/bin or /bin - replace it with /gnu/store ;; There is no /usr/bin or /bin - replace it with /gnu/store
(substitute* "testsuite/cpio.tests" (substitute* "testsuite/cpio.tests"
(("/usr/bin") (%store-directory)) (("/usr/bin") (%store-directory))
(("usr") (car (filter (negate string-null?) (("usr") (car (filter (negate string-null?)
(string-split (%store-directory) #\/))))) (string-split (%store-directory) #\/)))))
(substitute* "testsuite/date/date-works-1" (substitute* "testsuite/date/date-works-1"
(("/bin/date") (which "date"))) (("/bin/date") (which "date")))
;; The pidof tests assume that pid 1 is called "init" but that is not ;; The pidof tests assume that pid 1 is called "init" but that is not
;; true in guix build environment ;; true in guix build environment
(substitute* "testsuite/pidof.tests" (substitute* "testsuite/pidof.tests"
(("-s init") "-s $(cat /proc/1/comm)")) (("-s init") "-s $(cat /proc/1/comm)"))
(substitute* "testsuite/grep.tests" (substitute* "testsuite/grep.tests"
;; The subject of this test is buggy. It is known by upstream (fixed in git) ;; The subject of this test is buggy. It is known by upstream (fixed in git)
;; So mark it with SKIP_KNOWN_BUGS like the others. ;; So mark it with SKIP_KNOWN_BUGS like the others.
;; Presumably it wasn't known at the time of release ... ;; Presumably it wasn't known at the time of release ...
;; (It is strange that they release software which they know to have bugs) ;; (It is strange that they release software which they know to have bugs)
(("testing \"grep -w \\^str doesn't match str not at the beginning\"") (("testing \"grep -w \\^str doesn't match str not at the beginning\"")
"test x\"$SKIP_KNOWN_BUGS\" = x\"\" && testing \"grep -w ^str doesn't match str not at the beginning\"")) "test x\"$SKIP_KNOWN_BUGS\" = x\"\" && testing \"grep -w ^str doesn't match str not at the beginning\""))
;; This test cannot possibly pass. ;; This test cannot possibly pass.
;; It is trying to test that "which ls" returns "/bin/ls" when PATH is not set. ;; It is trying to test that "which ls" returns "/bin/ls" when PATH is not set.
@ -84,16 +83,14 @@
;; "V=1" ;; "V=1"
"SKIP_KNOWN_BUGS=1" "SKIP_KNOWN_BUGS=1"
"SKIP_INTERNET_TESTS=1" "SKIP_INTERNET_TESTS=1"
"check"))) "check"))))
(alist-replace (replace 'install
'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?
(zero? (system* "make"
(system* "make" (string-append "CONFIG_PREFIX=" out)
(string-append "CONFIG_PREFIX=" out) "install"))))))))
"install"))))
%standard-phases)))))
(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)