* [bug#63420] [PATCH v1 0/4] Guix patches for btrfs-progs
@ 2023-05-10 16:34 Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 1/4] gnu: btrfs-progs: Run 'guix style' over the package Denis 'GNUtoo' Carikli
2023-05-18 17:53 ` bug#63420: [PATCH v1 0/4] Guix patches for btrfs-progs Ludovic Courtès
0 siblings, 2 replies; 6+ messages in thread
From: Denis 'GNUtoo' Carikli @ 2023-05-10 16:34 UTC (permalink / raw)
To: leo, me, 63420; +Cc: Denis 'GNUtoo' Carikli
Hi,
Here a set of patches to improve btrfs-progs: In addition to some cleanups, it
adds back support for i686-linux and updates it to 6.3.
Denis 'GNUtoo' Carikli (4):
gnu: btrfs-progs: Run 'guix style' over the package.
gnu: btrfs-progs: Use new style inputs and gexps.
gnu: btrfs-progs: Make the python-sphinx input conditional.
gnu: btrfs-progs: Update to 6.3.
gnu/packages/linux.scm | 132 ++++++++++++++++++++++++-----------------
1 file changed, 76 insertions(+), 56 deletions(-)
base-commit: e0c35d1578c10a8fe27c8372f3a8bb5dd88b01b8
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#63420] [PATCH v1 1/4] gnu: btrfs-progs: Run 'guix style' over the package.
2023-05-10 16:34 [bug#63420] [PATCH v1 0/4] Guix patches for btrfs-progs Denis 'GNUtoo' Carikli
@ 2023-05-10 16:39 ` Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 2/4] gnu: btrfs-progs: Use new style inputs and gexps Denis 'GNUtoo' Carikli
` (2 more replies)
2023-05-18 17:53 ` bug#63420: [PATCH v1 0/4] Guix patches for btrfs-progs Ludovic Courtès
1 sibling, 3 replies; 6+ messages in thread
From: Denis 'GNUtoo' Carikli @ 2023-05-10 16:39 UTC (permalink / raw)
To: Leo Famulari, Tobias Geerinckx-Rice, 63420; +Cc: Denis 'GNUtoo' Carikli
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
gnu/packages/linux.scm | 60 ++++++++++++++++++++++--------------------
1 file changed, 32 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ea64e9d241..c2449f0b45 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -66,7 +66,7 @@
;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2022 Rene Saavedra <nanuui@protonmail.com>
;;; Copyright © 2022 muradm <mail@muradm.net>
-;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2022 Hunter Jozwiak <hunter.t.joz@gmail.com>
;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2022 Stefan <stefan-guix@vodafonemail.de>
@@ -5884,14 +5884,13 @@ (define-public btrfs-progs
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/kernel/"
- "people/kdave/btrfs-progs/"
- "btrfs-progs-v" version ".tar.xz"))
+ "people/kdave/btrfs-progs/" "btrfs-progs-v"
+ version ".tar.xz"))
(sha256
(base32
"0ylxszcsm0jqsa5glccd1pv3rcfk1f5wjcf3ayxc0r9xgzcngrkb"))))
(build-system gnu-build-system)
- (outputs '("out"
- "static")) ; static versions of the binaries in "out"
+ (outputs '("out" "static")) ;static versions of the binaries in "out"
(arguments
'(#:configure-flags
;; The ‘Python support’ was never actually installed by previous
@@ -5904,29 +5903,33 @@ (define-public btrfs-progs
(("\\$\\(DESTDIR\\)\\$\\(udevruledir\\)")
(string-append (assoc-ref outputs "out")
"/lib/udev/rules.d")))))
- (add-after 'build 'build-static
- (lambda _ (invoke "make" "static")))
- (add-after 'install 'install-bash-completion
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bashcomp (string-append out "/etc/bash_completion.d")))
- (mkdir-p bashcomp)
- (copy-file "btrfs-completion"
- (string-append bashcomp "/btrfs")))))
- (add-after 'install 'install-static
- (let ((staticbin (string-append (assoc-ref %outputs "static")
- "/bin")))
- (lambda _
- (invoke "make"
- (string-append "bindir=" staticbin)
- "install-static")))))
- #:tests? #f ; XXX: require the 'btrfs' kernel module.
+ (add-after 'build 'build-static
+ (lambda _
+ (invoke "make" "static")))
+ (add-after 'install 'install-bash-completion
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bashcomp (string-append out
+ "/etc/bash_completion.d")))
+ (mkdir-p bashcomp)
+ (copy-file "btrfs-completion"
+ (string-append bashcomp "/btrfs")))))
+ (add-after 'install 'install-static
+ (let ((staticbin (string-append (assoc-ref %outputs
+ "static")
+ "/bin")))
+ (lambda _
+ (invoke "make"
+ (string-append "bindir=" staticbin)
+ "install-static")))))
+ #:tests? #f ;XXX: require the 'btrfs' kernel module.
#:test-target "test"
- #:parallel-tests? #f)) ; tests fail when run in parallel
- (inputs `(("e2fsprogs" ,e2fsprogs) ; for btrfs-convert
+ #:parallel-tests? #f)) ;tests fail when run in parallel
+ (inputs `(("e2fsprogs" ,e2fsprogs)
+ ;for btrfs-convert
("eudev" ,eudev)
("lzo" ,lzo)
- ("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid
+ ("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid
("util-linux:static" ,util-linux "static") ;ditto
("zlib" ,zlib)
("zlib:static" ,zlib "static")
@@ -5938,14 +5941,15 @@ (define-public btrfs-progs
;; For tests.
("acl" ,acl)
("dmsetup" ,lvm2)
- ("grep" ,grep) ; need Perl regexp support
+ ("grep" ,grep) ;need Perl regexp support
("libaio" ,libaio)
("liburing" ,liburing)
- ("util-linux" ,util-linux) ; for fallocate
+ ("util-linux" ,util-linux) ;for fallocate
("which" ,which)))
(home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page")
(synopsis "Create and manage btrfs copy-on-write file systems")
- (description "Btrfs is a @acronym{CoW, copy-on-write} file system for Linux
+ (description
+ "Btrfs is a @acronym{CoW, copy-on-write} file system for Linux
aimed at implementing advanced features while focusing on fault tolerance,
repair and easy administration.")
;; GPL2+: crc32.c, radix-tree.c, raid6.c, rbtree.c.
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#63420] [PATCH v1 2/4] gnu: btrfs-progs: Use new style inputs and gexps.
2023-05-10 16:39 ` [bug#63420] [PATCH v1 1/4] gnu: btrfs-progs: Run 'guix style' over the package Denis 'GNUtoo' Carikli
@ 2023-05-10 16:39 ` Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 3/4] gnu: btrfs-progs: Make the python-sphinx input conditional Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 4/4] gnu: btrfs-progs: Update to 6.3 Denis 'GNUtoo' Carikli
2 siblings, 0 replies; 6+ messages in thread
From: Denis 'GNUtoo' Carikli @ 2023-05-10 16:39 UTC (permalink / raw)
To: Leo Famulari, Tobias Geerinckx-Rice, 63420; +Cc: Denis 'GNUtoo' Carikli
* gnu/packages/linux.scm (btrfs-progs)[arguments]: Use new style and gexps.
[inputs]: Use new style.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
gnu/packages/linux.scm | 100 ++++++++++++++++++++---------------------
1 file changed, 49 insertions(+), 51 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c2449f0b45..a71100baab 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5892,60 +5892,58 @@ (define-public btrfs-progs
(build-system gnu-build-system)
(outputs '("out" "static")) ;static versions of the binaries in "out"
(arguments
- '(#:configure-flags
- ;; The ‘Python support’ was never actually installed by previous
- ;; versions of this package, but did prevent cross-compilation.
- (list "--disable-python")
- #:phases (modify-phases %standard-phases
- (add-after 'unpack 'patch-makefile
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "Makefile"
- (("\\$\\(DESTDIR\\)\\$\\(udevruledir\\)")
- (string-append (assoc-ref outputs "out")
- "/lib/udev/rules.d")))))
- (add-after 'build 'build-static
- (lambda _
- (invoke "make" "static")))
- (add-after 'install 'install-bash-completion
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bashcomp (string-append out
- "/etc/bash_completion.d")))
- (mkdir-p bashcomp)
- (copy-file "btrfs-completion"
- (string-append bashcomp "/btrfs")))))
- (add-after 'install 'install-static
- (let ((staticbin (string-append (assoc-ref %outputs
- "static")
- "/bin")))
- (lambda _
- (invoke "make"
- (string-append "bindir=" staticbin)
- "install-static")))))
+ (list
+ #:configure-flags
+ ;; The ‘Python support’ was never actually installed by previous
+ ;; versions of this package, but did prevent cross-compilation.
+ #~(list "--disable-python")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-makefile
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "Makefile"
+ (("\\$\\(DESTDIR\\)\\$\\(udevruledir\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib/udev/rules.d")))))
+ (add-after 'build 'build-static
+ (lambda _
+ (invoke "make" "static")))
+ (add-after 'install 'install-bash-completion
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bashcomp (string-append out
+ "/etc/bash_completion.d")))
+ (mkdir-p bashcomp)
+ (copy-file "btrfs-completion"
+ (string-append bashcomp "/btrfs")))))
+ (add-after 'install 'install-static
+ (let ((staticbin (string-append (assoc-ref %outputs
+ "static")
+ "/bin")))
+ (lambda _
+ (invoke "make"
+ (string-append "bindir=" staticbin)
+ "install-static")))))
#:tests? #f ;XXX: require the 'btrfs' kernel module.
#:test-target "test"
#:parallel-tests? #f)) ;tests fail when run in parallel
- (inputs `(("e2fsprogs" ,e2fsprogs)
- ;for btrfs-convert
- ("eudev" ,eudev)
- ("lzo" ,lzo)
- ("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid
- ("util-linux:static" ,util-linux "static") ;ditto
- ("zlib" ,zlib)
- ("zlib:static" ,zlib "static")
- ("zstd" ,zstd "lib")
- ("zstd:static" ,zstd "static")))
- (native-inputs `(("pkg-config" ,pkg-config)
- ;; For building documentation.
- ("python-sphinx" ,python-sphinx)
- ;; For tests.
- ("acl" ,acl)
- ("dmsetup" ,lvm2)
- ("grep" ,grep) ;need Perl regexp support
- ("libaio" ,libaio)
- ("liburing" ,liburing)
- ("util-linux" ,util-linux) ;for fallocate
- ("which" ,which)))
+ (inputs (list e2fsprogs ;; For btrfs-convert.
+ eudev
+ lzo
+ `(,util-linux "lib") ;; For libblkid and libuuid.
+ `(,util-linux "static") ;; Ditto.
+ zlib
+ `(,zlib "static")
+ `(,zstd "lib")
+ `(,zstd "static")))
+ (native-inputs (list pkg-config
+ python-sphinx ;; For building documentation.
+ acl ;; For tests.
+ lvm2 ;; For dmsetup.
+ grep ;; Need Perl regexp support.
+ libaio
+ liburing
+ util-linux ;; For fallocate.
+ which))
(home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page")
(synopsis "Create and manage btrfs copy-on-write file systems")
(description
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#63420] [PATCH v1 3/4] gnu: btrfs-progs: Make the python-sphinx input conditional.
2023-05-10 16:39 ` [bug#63420] [PATCH v1 1/4] gnu: btrfs-progs: Run 'guix style' over the package Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 2/4] gnu: btrfs-progs: Use new style inputs and gexps Denis 'GNUtoo' Carikli
@ 2023-05-10 16:39 ` Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 4/4] gnu: btrfs-progs: Update to 6.3 Denis 'GNUtoo' Carikli
2 siblings, 0 replies; 6+ messages in thread
From: Denis 'GNUtoo' Carikli @ 2023-05-10 16:39 UTC (permalink / raw)
To: Leo Famulari, Tobias Geerinckx-Rice, 63420; +Cc: Denis 'GNUtoo' Carikli
* gnu/packages/linux.scm (btrfs-progs) [native-inputs]:
Make the python-sphinx input conditional.
[arguments]: Conditionally add --disable-documentation to
configure flags.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
gnu/packages/linux.scm | 42 ++++++++++++++++++++++++++++++------------
1 file changed, 30 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a71100baab..e910c47ab9 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5894,9 +5894,18 @@ (define-public btrfs-progs
(arguments
(list
#:configure-flags
- ;; The ‘Python support’ was never actually installed by previous
- ;; versions of this package, but did prevent cross-compilation.
- #~(list "--disable-python")
+ #~(append
+ ;; Without --disable-documentation, it complains about missing
+ ;; python-sphinx on systems where this package isn't available
+ ;; (because it requires Rust).
+ (if #$@(member (%current-system)
+ (package-transitive-supported-systems
+ python-sphinx))
+ '()
+ (list "--disable-documentation"))
+ ;; The ‘Python support’ was never actually installed by previous
+ ;; versions of this package, but did prevent cross-compilation.
+ (list "--disable-python"))
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys)
@@ -5935,15 +5944,24 @@ (define-public btrfs-progs
`(,zlib "static")
`(,zstd "lib")
`(,zstd "static")))
- (native-inputs (list pkg-config
- python-sphinx ;; For building documentation.
- acl ;; For tests.
- lvm2 ;; For dmsetup.
- grep ;; Need Perl regexp support.
- libaio
- liburing
- util-linux ;; For fallocate.
- which))
+ (native-inputs
+ (append
+ ;; For building documentation. Since python-sphinx
+ ;; requires Rust, add it conditionally depending on such
+ ;; support.
+ (if (member (%current-system)
+ (package-transitive-supported-systems
+ python-sphinx))
+ (list python-sphinx)
+ '())
+ (list pkg-config
+ acl ;; For tests.
+ lvm2 ;; For dmsetup.
+ grep ;; Need Perl regexp support.
+ libaio
+ liburing
+ util-linux ;; For fallocate.
+ which)))
(home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page")
(synopsis "Create and manage btrfs copy-on-write file systems")
(description
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#63420] [PATCH v1 4/4] gnu: btrfs-progs: Update to 6.3.
2023-05-10 16:39 ` [bug#63420] [PATCH v1 1/4] gnu: btrfs-progs: Run 'guix style' over the package Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 2/4] gnu: btrfs-progs: Use new style inputs and gexps Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 3/4] gnu: btrfs-progs: Make the python-sphinx input conditional Denis 'GNUtoo' Carikli
@ 2023-05-10 16:39 ` Denis 'GNUtoo' Carikli
2 siblings, 0 replies; 6+ messages in thread
From: Denis 'GNUtoo' Carikli @ 2023-05-10 16:39 UTC (permalink / raw)
To: Leo Famulari, Tobias Geerinckx-Rice, 63420; +Cc: Denis 'GNUtoo' Carikli
* gnu/packages/linux.scm (btrfs-progs): Update to 6.3.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e910c47ab9..5ac958e2e2 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5880,7 +5880,7 @@ (define-public gpm
(define-public btrfs-progs
(package
(name "btrfs-progs")
- (version "6.1.2")
+ (version "6.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/kernel/"
@@ -5888,7 +5888,7 @@ (define-public btrfs-progs
version ".tar.xz"))
(sha256
(base32
- "0ylxszcsm0jqsa5glccd1pv3rcfk1f5wjcf3ayxc0r9xgzcngrkb"))))
+ "0zbampc47nq3h8as3rda2apns5sj93ywxnrkal74kjvyg3zvv820"))))
(build-system gnu-build-system)
(outputs '("out" "static")) ;static versions of the binaries in "out"
(arguments
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#63420: [PATCH v1 0/4] Guix patches for btrfs-progs
2023-05-10 16:34 [bug#63420] [PATCH v1 0/4] Guix patches for btrfs-progs Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 1/4] gnu: btrfs-progs: Run 'guix style' over the package Denis 'GNUtoo' Carikli
@ 2023-05-18 17:53 ` Ludovic Courtès
1 sibling, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2023-05-18 17:53 UTC (permalink / raw)
To: Denis 'GNUtoo' Carikli; +Cc: 63420-done, me, leo
Hi,
Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> skribis:
> gnu: btrfs-progs: Run 'guix style' over the package.
> gnu: btrfs-progs: Use new style inputs and gexps.
> gnu: btrfs-progs: Make the python-sphinx input conditional.
> gnu: btrfs-progs: Update to 6.3.
Applied with a minor stylistic change for margin comments (single colon,
no capitalization, no period).
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-18 17:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-10 16:34 [bug#63420] [PATCH v1 0/4] Guix patches for btrfs-progs Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 1/4] gnu: btrfs-progs: Run 'guix style' over the package Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 2/4] gnu: btrfs-progs: Use new style inputs and gexps Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 3/4] gnu: btrfs-progs: Make the python-sphinx input conditional Denis 'GNUtoo' Carikli
2023-05-10 16:39 ` [bug#63420] [PATCH v1 4/4] gnu: btrfs-progs: Update to 6.3 Denis 'GNUtoo' Carikli
2023-05-18 17:53 ` bug#63420: [PATCH v1 0/4] Guix patches for btrfs-progs Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).