guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 83e76aa1f3b7be79c10c7a160c4b4cc8e75020f7
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Mon Oct 13 22:20:49 2025 +0900
gnu: libblockdev: More thoroughly patch commands.
* gnu/packages/disk.scm (libblockdev) [#:phases]
{patch-plugins-paths}: Rename to...
{patch-paths}: ... this, and extend with more patching.
[inputs]: Add exfatprogs, f2fs-tools, nilfs-utils and udftools.
Fixes: #3466
Change-Id: I35659abcd7cdefa694f69900e5c956812f937499
---
gnu/packages/disk.scm | 79 ++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 66 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index b5db001d0d..269a706370 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -24,7 +24,7 @@
;;; Copyright © 2021 Justin Veilleux <[email protected]>
;;; Copyright © 2021 Sarah Morgensen <[email protected]>
;;; Copyright © 2014, 2022 Ludovic Courtès <[email protected]>
-;;; Copyright © 2022 Maxim Cournoyer <[email protected]>
+;;; Copyright © 2022, 2025 Maxim Cournoyer <[email protected]>
;;; Copyright © 2022 Disseminate Dissent <[email protected]>
;;; Copyright © 2023 Timotej Lazar <[email protected]>
;;; Copyright © 2023 Morgan Smith <[email protected]>
@@ -1341,6 +1341,7 @@ to create devices with respective mappings for the
ATARAID sets discovered.")
(build-system gnu-build-system)
(arguments
(list
+ #:modules (cons '(ice-9 format) %default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-configuration-directory
@@ -1348,22 +1349,70 @@ to create devices with respective mappings for the
ATARAID sets discovered.")
(substitute* "src/lib/blockdev.c"
(("/etc/libblockdev/conf.d/" path)
(string-append #$output path)))))
- (add-after 'unpack 'patch-plugin-paths
+ (add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
+ (define* (find-program program #:key fail-if-missing?)
+ (or (and (string=? "vfat-resize" program)
+ (string-append #$output "/bin/vfat-resize"))
+ (false-if-exception
+ (search-input-file inputs
+ (string-append "bin/" program)))
+ (false-if-exception
+ (search-input-file inputs
+ (string-append "sbin/" program)))
+ (if fail-if-missing?
+ (error "could not find" program)
+ (begin
+ (format (current-warning-port)
+ "warning: program ~s left unpatched~%"
+ program)
+ program))))
(substitute* (find-files "src/plugins" "\\.c$")
(("(gchar \\*arg.+\\{\")([^\"]+)" all start program)
(string-append
- start (or (false-if-exception
- (search-input-file inputs
- (string-append "bin/"
program)))
- (false-if-exception
- (search-input-file inputs
- (string-append "sbin/"
program)))
- (begin
- (format (current-warning-port)
- "warning: program ~s left unpatched~%"
- program)
- program))))))))))
+ start (find-program program))))
+ (substitute* "src/plugins/fs/generic.c"
+ (("_util = \"([^\"]*)\"" all program)
+ (format #f "_util = ~s" (find-program program))))
+ ;; Tip: look for check_deps calls in the source to find where
+ ;; commands are looked up from PATH.
+ (let-syntax
+ ((patch-helpers
+ (lambda (x)
+ (syntax-case x ()
+ ((_ file (helpers ...))
+ (with-syntax ((pattern (datum->syntax x 'pattern)))
+ #'(let ((pattern (format #f "\"(~{~a~^|~})\""
+ '(helpers ...))))
+ (substitute* file
+ ((pattern dummy program)
+ (format
+ #f "~s"
+ (find-program
+ program #:fail-if-missing? #t)))))))))))
+
+ (patch-helpers "src/plugins/fs/btrfs.c"
+ ("mkfs.btrfs" "btrfsck" "btrfs" "btrfstune"))
+ (patch-helpers "src/plugins/fs/exfat.c"
+ ("mkfs.exfat" "fsck.exfat" "tune.exfat"))
+ (patch-helpers "src/plugins/fs/ext.c"
+ ("mke2fs" "e2fsck" "tune2fs" "resize2fs"))
+ (patch-helpers "src/plugins/fs/f2fs.c"
+ ("mkfs.f2fs" "fsck.f2fs" "dump.f2fs"
+ "resize.f2fs"))
+ (patch-helpers "src/plugins/fs/nilfs.c"
+ ("mkfs.nilfs2" "nilfs-tune" "nilfs-resize"))
+ (patch-helpers "src/plugins/fs/ntfs.c"
+ ("mkntfs" "ntfsfix" "ntfsresize" "ntfslabel"
+ "ntfsinfo"))
+ (patch-helpers "src/plugins/fs/udf.c"
+ ("mkudffs" "udflabel" "udfinfo"))
+ (patch-helpers "src/plugins/fs/vfat.c"
+ ("mkfs.vfat" "fat label" "fsck.vfat"
+ "vfat-resize" "fatlabel"))
+ (patch-helpers "src/plugins/fs/xfs.c"
+ ("mkfs.xfs" "xfs_db" "xfs_repair" "xfs_admin"
+ "xfs_growfs"))))))))
(native-inputs
(list gobject-introspection
pkg-config
@@ -1380,6 +1429,8 @@ to create devices with respective mappings for the
ATARAID sets discovered.")
dmraid
e2fsprogs
eudev
+ exfatprogs
+ f2fs-tools
glib
gptfdisk
json-glib-minimal
@@ -1392,9 +1443,11 @@ to create devices with respective mappings for the
ATARAID sets discovered.")
lvm2
mdadm
ndctl
+ nilfs-utils
nss
ntfs-3g
parted
+ udftools
util-linux
volume-key
xfsprogs)))
