ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: busybox: Update to 1.34.1.

Browse source 
* gnu/packages/busybox.scm (busybox): Update to 1.34.1.
[arguments]: Don't explicitly return #t from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2022-05-22 02:00:01 +02:00
parent caa51b5d10
commit a927a9e25b
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/busybox.scm
View file

@ -1,7 +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, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -34,7 +34,7 @@ (define-module (gnu packages busybox)
(define-public busybox (define-public busybox
(package (package
(name "busybox") (name "busybox")
(version "1.33.1") (version "1.34.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -42,22 +42,20 @@ (define-public busybox
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0a0dcvsh7nxnhxc5y73fky0z30i9p7r30qfidm2akn0n5fywdkhj")))) "0jfm9fik7nv4w21zqdg830pddgkdjmplmna9yjn9ck1lwn4vsps1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'disable-timestamps (add-before 'configure 'disable-timestamps
(lambda _ (lambda _
(setenv "KCONFIG_NOTIMESTAMP" "1") (setenv "KCONFIG_NOTIMESTAMP" "1")))
#t))
(add-before 'configure 'disable-taskset (add-before 'configure 'disable-taskset
;; This feature fails its tests in the build environment, ;; This feature fails its tests in the build environment,
;; was default 'n' until after 1.26.2. ;; was default 'n' until after 1.26.2.
(lambda _ (lambda _
(substitute* "util-linux/taskset.c" (substitute* "util-linux/taskset.c"
(("default y") "default n")) (("default y") "default n"))))
#t))
(replace 'configure (replace 'configure
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "defconfig" make-flags))) (apply invoke "make" "defconfig" make-flags)))
@ -65,8 +63,7 @@ (define-public busybox
(lambda _ (lambda _
(substitute* ".config" (substitute* ".config"
(("# CONFIG_INSTALL_NO_USR is not set") (("# CONFIG_INSTALL_NO_USR is not set")
"CONFIG_INSTALL_NO_USR=y")) "CONFIG_INSTALL_NO_USR=y"))))
#t))
(replace 'check (replace 'check
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(substitute* '("testsuite/du/du-s-works" (substitute* '("testsuite/du/du-s-works"