me
/
guix
Archived
1
0
Fork 0

gnu: bcachefs-tools: Update to 0.1-17.c8bec83.

* gnu/packages/file-systems.scm (bcachefs-tools): Update to 0.1-17.c8bec83.
[arguments]: Remove obsolete PYTEST_ variables from #:make-flags, and add
NO_RUST.  Delete the obsolete 'promote-mount.bcachefs.sh phase.
Add a custom 'check phase.
[native-inputs]: Consolidate separate lists.
master
Tobias Geerinckx-Rice 2023-07-16 02:00:04 +02:00
parent 09c14288cf
commit f858d5c8a5
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 32 additions and 40 deletions

View File

@ -574,8 +574,8 @@ from a mounted file system.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public bcachefs-tools (define-public bcachefs-tools
(let ((commit "46a6b9210c927ab46fd1227cb6f641be0b4a7505") (let ((commit "c8bec83e307f28751c433ba1d3f648429fb5a34c")
(revision "16")) (revision "17"))
(package (package
(name "bcachefs-tools") (name "bcachefs-tools")
(version (git-version "0.1" revision commit)) (version (git-version "0.1" revision commit))
@ -587,7 +587,7 @@ from a mounted file system.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0jblpwz8mxrx0pa2gc5bwj60qjj2c0zmd8r06f2bhgzs75avpkj3")))) (base32 "0b1avy5mw3r3ppfs3n9cq4zb74yl45nd5l69r6hi27z9q5bc3nv8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:make-flags (list #:make-flags
@ -596,47 +596,39 @@ from a mounted file system.")
"INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools" "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
(string-append "CC=" #$(cc-for-target)) (string-append "CC=" #$(cc-for-target))
(string-append "PKG_CONFIG=" #$(pkg-config-for-target)) (string-append "PKG_CONFIG=" #$(pkg-config-for-target))
(string-append "PYTEST_CMD=" ;; This will be less of an option in the future, as more
#$(this-package-native-input "python-pytest") ;; code gets rewritten in Rust.
"/bin/pytest") "NO_RUST=better")
(string-append "PYTEST_ARGS=-k '"
;; These fail (invalid argument) on
;; kernels with a previous bcachefs version.
"not test_format and "
"not test_fsck and "
"not test_list and "
"not test_list_inodes and "
"not test_list_dirent"
"'"))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
(add-after 'install 'promote-mount.bcachefs.sh (replace 'check
;; XXX The (optional) mount.bcachefs requires rust:cargo. ;; The test suite is moribund upstream (never been useful),
;; This shell alternative does the job well enough for now. ;; but let's keep running it as a sanity check until then.
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key tests? make-flags #:allow-other-keys)
(define (whence file) (when tests?
(dirname (search-input-file inputs file))) ;; We must manually build the test_helper first.
(with-directory-excursion (string-append #$output "/sbin") (apply invoke "make" "tests" make-flags)
(rename-file "mount.bcachefs.sh" "mount.bcachefs") (invoke (string-append
;; WRAP-SCRIPT causes bogus Insufficient arguments errors. #$(this-package-native-input "python-pytest")
(wrap-program "mount.bcachefs" "/bin/pytest") "-k"
`("PATH" ":" prefix ;; These fail (invalid argument) on kernels
,(list (getcwd) ;; with a previous bcachefs version.
(whence "bin/tail") (string-append "not test_format and "
(whence "bin/awk") "not test_fsck and "
(whence "bin/mount")))))))))) "not test_list and "
"not test_list_inodes and "
"not test_list_dirent"))))))))
(native-inputs (native-inputs
(append (cons* pkg-config
(list pkg-config ;; For generating documentation with rst2man.
python
python-docutils
;; For tests. ;; For tests.
python-pytest) python-pytest
(if (member (%current-system) (package-supported-systems valgrind)) (if (member (%current-system) (package-supported-systems valgrind))
(list valgrind) (list valgrind)
'()) '())))
;; For generating documentation with rst2man.
(list python
python-docutils)))
(inputs (inputs
(list eudev (list eudev
keyutils keyutils