GNU bug report logs - #63420
[PATCH v1 0/4] Guix patches for btrfs-progs

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63420 in the body.
You can then email your comments to 63420 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: Leo Famulari <leo <at> famulari.name>, Tobias Geerinckx-Rice <me <at> tobias.gr>,
 guix-patches <at> gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v1 0/4] Guix patches for btrfs-progs
Date: Wed, 10 May 2023 18:34:46 +0200

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

Message #8 received at 63420 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: Leo Famulari <leo <at> famulari.name>, Tobias Geerinckx-Rice <me <at> tobias.gr>,
 63420 <at> debbugs.gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v1 1/4] gnu: btrfs-progs: Run 'guix style' over the package.
Date: Wed, 10 May 2023 18:39:22 +0200

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo <at> 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 <at> gmail.com>
 ;;; Copyright © 2022 Rene Saavedra <nanuui <at> protonmail.com>
 ;;; Copyright © 2022 muradm <mail <at> muradm.net>
-;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
+;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
 ;;; Copyright © 2022 Hunter Jozwiak <hunter.t.joz <at> gmail.com>
 ;;; Copyright © 2022 Hilton Chain <hako <at> ultrarare.space>
 ;;; Copyright © 2022 Stefan <stefan-guix <at> 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

Message #11 received at 63420 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: Leo Famulari <leo <at> famulari.name>, Tobias Geerinckx-Rice <me <at> tobias.gr>,
 63420 <at> debbugs.gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v1 2/4] gnu: btrfs-progs: Use new style inputs and gexps.
Date: Wed, 10 May 2023 18:39:23 +0200

* gnu/packages/linux.scm (btrfs-progs)[arguments]: Use new style and gexps.
  [inputs]: Use new style.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo <at> 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

Message #14 received at 63420 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: Leo Famulari <leo <at> famulari.name>, Tobias Geerinckx-Rice <me <at> tobias.gr>,
 63420 <at> debbugs.gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v1 3/4] gnu: btrfs-progs: Make the python-sphinx input
 conditional.
Date: Wed, 10 May 2023 18:39:24 +0200

* 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 <at> 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

Message #17 received at 63420 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: Leo Famulari <leo <at> famulari.name>, Tobias Geerinckx-Rice <me <at> tobias.gr>,
 63420 <at> debbugs.gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v1 4/4] gnu: btrfs-progs: Update to 6.3.
Date: Wed, 10 May 2023 18:39:25 +0200

* gnu/packages/linux.scm (btrfs-progs): Update to 6.3.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo <at> 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

Message #22 received at 63420-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Cc: 63420-done <at> debbugs.gnu.org, me <at> tobias.gr, leo <at> famulari.name
Subject: Re: bug#63420: [PATCH v1 0/4] Guix patches for btrfs-progs
Date: Thu, 18 May 2023 19:53:01 +0200

Hi,

Denis 'GNUtoo' Carikli <GNUtoo <at> 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’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.