diff options
Diffstat (limited to 'gnu/packages/busybox.scm')
| -rw-r--r-- | gnu/packages/busybox.scm | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 5b038870de..7a548582f3 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -19,6 +19,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages busybox) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) @@ -106,11 +107,11 @@ (apply invoke "make" (string-append "CONFIG_PREFIX=" out) "install" make-flags))))))) - (native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man) - ;; The following are needed by the tests. - ("inetutils" ,inetutils) - ("which" ,(@ (gnu packages base) which)) - ("zip" ,zip))) + (native-inputs (list perl ; needed to generate the man pages (pod2man) + ;; The following are needed by the tests. + inetutils + (@ (gnu packages base) which) + zip)) (synopsis "Many common UNIX utilities in a single executable") (description "BusyBox combines tiny versions of many common UNIX utilities into a single small executable. It provides a fairly complete environment for @@ -122,7 +123,7 @@ any small or embedded system.") (define-public toybox (package (name "toybox") - (version "0.8.3") + (version "0.8.6") (source (origin (method url-fetch) (uri (string-append @@ -130,31 +131,36 @@ any small or embedded system.") version ".tar.gz")) (sha256 (base32 - "00aw9d809wj1bqlb2fsssdgz7rj0363ya14py0gfdm0rkp98zcpa")))) + "0jq3368jps6jg717ikzhlc6whml3k2s9xy69zpj4i0r35c5ck622")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'set-environment-variables - (lambda _ - (setenv "CC" ,(cc-for-target)) - (setenv "HOSTCC" (which "gcc")) - #t)) - (replace 'configure - (lambda _ (invoke "make" "defconfig"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "make" - (string-append "PREFIX=" out) - "install")))) - (add-after 'install 'remove-usr-directory - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively (string-append out "/usr")) - #t)))) - #:test-target "tests")) - (native-inputs `(("bc" ,bc))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'set-environment-variables + (lambda _ + (setenv "CC" #$(cc-for-target)) + (setenv "HOSTCC" (which "gcc")))) + (replace 'configure + (lambda _ (invoke "make" "defconfig"))) + (add-before 'check 'fix-or-skip-broken-tests + (lambda _ + ;; Some tests expect $USER to magically be the current user. + (setenv "USER" (passwd:name (getpwnam (geteuid)))) + ;; This expects directories to be exactly 4K. They aren't! + (delete-file "tests/du.test") + ;; Delete tests that expect a root or 0 user to exist. + (substitute* "tests/id.test" + (("^testing .*[ \\(]root.*") "")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" + (string-append "PREFIX=" #$output) + "install"))) + (add-after 'install 'remove-usr-directory + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append #$output "/usr"))))) + #:test-target "tests")) + (native-inputs (list bc)) (synopsis "Many common UNIX utilities in a single executable") (description "ToyBox combines tiny versions of many common UNIX utilities into a single small executable. It provides a fairly complete environment for |