GNU bug report logs - #75119
[PATCH] gnu: e2fsprogs: Update to 1.47.1.

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 75119 in the body.
You can then email your comments to 75119 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: Ashish SHUKLA <ashish.is <at> lostca.se>
To: guix-patches <at> gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH] gnu: e2fsprogs: Update to 1.47.1.
Date: Thu, 26 Dec 2024 14:59:26 +0000

* gnu/packages/linux.scm (e2fsprogs): Update to 1.47.1.

Change-Id: I428973b6a04a99eca96592d79d1bf7da47fd6680
---
 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 78d3d737b5..b9c7755dfa 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2738,7 +2738,7 @@ (define-public usbip-utils
 (define-public e2fsprogs
   (package
     (name "e2fsprogs")
-    (version "1.47.0")
+    (version "1.47.1")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -2747,7 +2747,7 @@ (define-public e2fsprogs
                    "e2fsprogs-" version ".tar.xz"))
              (sha256
               (base32
-               "1nymjw801lmlr5y6bg1zv9jsip5dkyxqislbdzpir4mx5czzajhl"))))
+               "1lg0k5fh41nl0ldbh76hwdx3g5kqzqyc245vljy88wnlgw2dqcss"))))
     (build-system gnu-build-system)
     (inputs (list `(,util-linux "lib")))
     (native-inputs (list pkg-config

base-commit: f96c14e3ca6b22e56621cc04a1bf06a8cac6ca23
-- 
2.47.1

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Ashish SHUKLA <ashish.is <at> lostca.se>
Cc: 75119 <at> debbugs.gnu.org, Wilko Meyer <w <at> wmeyer.eu>,
 Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#75119] [PATCH] gnu: e2fsprogs: Update to 1.47.1.
Date: Mon, 10 Mar 2025 15:03:32 +0100

Ashish SHUKLA <ashish.is <at> lostca.se> skribis:

> * gnu/packages/linux.scm (e2fsprogs): Update to 1.47.1.
>
> Change-Id: I428973b6a04a99eca96592d79d1bf7da47fd6680

Interestingly, this breaks btrfs-progs:

--8<---------------cut here---------------start------------->8---
convert/source-ext2.c: In function ‘ext4_copy_inode_timespec_extra’:
convert/source-ext2.c:733:13: warning: implicit declaration of function ‘inode_includes’ [-Wimplicit-function-declaration]
  733 |         if (inode_includes(inode_size, i_ ## xtime ## _extra)) {                        \
      |             ^~~~~~~~~~~~~~
convert/source-ext2.c:769:9: note: in expansion of macro ‘EXT4_COPY_XTIME’
  769 |         EXT4_COPY_XTIME(atime, dst, tv_sec, tv_nsec);
      |         ^~~~~~~~~~~~~~~
convert/source-ext2.c:733:40: error: ‘i_atime_extra’ undeclared (first use in this function)
  733 |         if (inode_includes(inode_size, i_ ## xtime ## _extra)) {                        \
      |                                        ^~
convert/source-ext2.c:769:9: note: in expansion of macro ‘EXT4_COPY_XTIME’
  769 |         EXT4_COPY_XTIME(atime, dst, tv_sec, tv_nsec);
      |         ^~~~~~~~~~~~~~~
convert/source-ext2.c:733:40: note: each undeclared identifier is reported only once for each function it appears in
  733 |         if (inode_includes(inode_size, i_ ## xtime ## _extra)) {                        \
      |                                        ^~
convert/source-ext2.c:769:9: note: in expansion of macro ‘EXT4_COPY_XTIME’
  769 |         EXT4_COPY_XTIME(atime, dst, tv_sec, tv_nsec);
      |         ^~~~~~~~~~~~~~~
convert/source-ext2.c:733:40: error: ‘i_mtime_extra’ undeclared (first use in this function)
  733 |         if (inode_includes(inode_size, i_ ## xtime ## _extra)) {                        \
      |                                        ^~
convert/source-ext2.c:770:9: note: in expansion of macro ‘EXT4_COPY_XTIME’
  770 |         EXT4_COPY_XTIME(mtime, dst, tv_sec, tv_nsec);
      |         ^~~~~~~~~~~~~~~
convert/source-ext2.c:733:40: error: ‘i_ctime_extra’ undeclared (first use in this function)
  733 |         if (inode_includes(inode_size, i_ ## xtime ## _extra)) {                        \
      |                                        ^~
convert/source-ext2.c:771:9: note: in expansion of macro ‘EXT4_COPY_XTIME’
  771 |         EXT4_COPY_XTIME(ctime, dst, tv_sec, tv_nsec);
      |         ^~~~~~~~~~~~~~~
convert/source-ext2.c:774:40: error: ‘i_crtime_extra’ undeclared (first use in this function)
  774 |         if (inode_includes(inode_size, i_crtime_extra)) {
      |                                        ^~~~~~~~~~~~~~
    [LD]     btrfs-select-super
make: *** [Makefile:453: convert/source-ext2.o] Error 1
--8<---------------cut here---------------end--------------->8---

(I tested with “./pre-inst-env guix build -P1 e2fsprogs”.)

Could you take a look?

Thanks
Ludo’.

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

From: "Ashish SHUKLA" <ashish.is <at> lostca.se>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 75119 <at> debbugs.gnu.org, Wilko
 Meyer <w <at> wmeyer.eu>, Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#75119] [PATCH] gnu: e2fsprogs: Update to 1.47.1.
Date: Mon, 10 Mar 2025 19:31:46 +0000

[Message part 1 (text/plain, inline)]

El 2025-03-10 15:03, Ludovic Courtès escribió:
> Ashish SHUKLA <ashish.is <at> lostca.se> skribis:
>
>> * gnu/packages/linux.scm (e2fsprogs): Update to 1.47.1.
>>
>> Change-Id: I428973b6a04a99eca96592d79d1bf7da47fd6680
>
> Interestingly, this breaks btrfs-progs:
>
> --8<---------------cut here---------------start------------->8---
> convert/source-ext2.c: In function ‘ext4_copy_inode_timespec_extra’:
> convert/source-ext2.c:733:13: warning: implicit declaration of function ‘inode_includes’ [-Wimplicit-function-declaration]
>   733 |         if (inode_includes(inode_size, i_ ## xtime ## _extra)) {                        \
>       |             ^~~~~~~~~~~~~~
> convert/source-ext2.c:769:9: note: in expansion of macro ‘EXT4_COPY_XTIME’
>   769 |         EXT4_COPY_XTIME(atime, dst, tv_sec, tv_nsec);
>       |         ^~~~~~~~~~~~~~~
> convert/source-ext2.c:733:40: error: ‘i_atime_extra’ undeclared (first use in this function)
>   733 |         if (inode_includes(inode_size, i_ ## xtime ## _extra)) {                        \
>       |                                        ^~
> convert/source-ext2.c:769:9: note: in expansion of macro ‘EXT4_COPY_XTIME’
>   769 |         EXT4_COPY_XTIME(atime, dst, tv_sec, tv_nsec);
>       |         ^~~~~~~~~~~~~~~
> convert/source-ext2.c:733:40: note: each undeclared identifier is reported only once for each function it appears in
>   733 |         if (inode_includes(inode_size, i_ ## xtime ## _extra)) {                        \
>       |                                        ^~
> convert/source-ext2.c:769:9: note: in expansion of macro ‘EXT4_COPY_XTIME’
>   769 |         EXT4_COPY_XTIME(atime, dst, tv_sec, tv_nsec);
>       |         ^~~~~~~~~~~~~~~
> convert/source-ext2.c:733:40: error: ‘i_mtime_extra’ undeclared (first use in this function)
>   733 |         if (inode_includes(inode_size, i_ ## xtime ## _extra)) {                        \
>       |                                        ^~
> convert/source-ext2.c:770:9: note: in expansion of macro ‘EXT4_COPY_XTIME’
>   770 |         EXT4_COPY_XTIME(mtime, dst, tv_sec, tv_nsec);
>       |         ^~~~~~~~~~~~~~~
> convert/source-ext2.c:733:40: error: ‘i_ctime_extra’ undeclared (first use in this function)
>   733 |         if (inode_includes(inode_size, i_ ## xtime ## _extra)) {                        \
>       |                                        ^~
> convert/source-ext2.c:771:9: note: in expansion of macro ‘EXT4_COPY_XTIME’
>   771 |         EXT4_COPY_XTIME(ctime, dst, tv_sec, tv_nsec);
>       |         ^~~~~~~~~~~~~~~
> convert/source-ext2.c:774:40: error: ‘i_crtime_extra’ undeclared (first use in this function)
>   774 |         if (inode_includes(inode_size, i_crtime_extra)) {
>       |                                        ^~~~~~~~~~~~~~
>     [LD]     btrfs-select-super
> make: *** [Makefile:453: convert/source-ext2.o] Error 1
> --8<---------------cut here---------------end--------------->8---
>
> (I tested with “./pre-inst-env guix build -P1 e2fsprogs”.)
>
> Could you take a look?

Sure, while here I'm also updating it to its latest version, 6.13.

Thanks!
-- 
Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0

"If I destroy you, what business is it of yours ?" (Dark Forest, Liu Cixin)

[signature.asc (application/pgp-signature, inline)]

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

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: ludo <at> gnu.org
Cc: 75119 <at> debbugs.gnu.org, Wilko Meyer <w <at> wmeyer.eu>,
 Ashish SHUKLA <ashish.is <at> lostca.se>, Leo Famulari <leo <at> famulari.name>
Subject: [PATCH v2 1/2] gnu: e2fsprogs: Update to 1.47.1.
Date: Mon, 10 Mar 2025 20:34:18 +0100

* gnu/packages/linux.scm (e2fsprogs): Update to 1.47.1.

Change-Id: I428973b6a04a99eca96592d79d1bf7da47fd6680
---
 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 5dbb6f9a96..690e9e23d5 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2790,7 +2790,7 @@ (define-public usbip-utils
 (define-public e2fsprogs
   (package
     (name "e2fsprogs")
-    (version "1.47.0")
+    (version "1.47.1")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -2799,7 +2799,7 @@ (define-public e2fsprogs
                    "e2fsprogs-" version ".tar.xz"))
              (sha256
               (base32
-               "1nymjw801lmlr5y6bg1zv9jsip5dkyxqislbdzpir4mx5czzajhl"))))
+               "1lg0k5fh41nl0ldbh76hwdx3g5kqzqyc245vljy88wnlgw2dqcss"))))
     (build-system gnu-build-system)
     (inputs (list `(,util-linux "lib")))
     (native-inputs (list pkg-config

base-commit: 5b4ae0b5c2d63e40c8adaf15d9ce0c456189f321
-- 
2.48.1

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

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: ludo <at> gnu.org
Cc: 75119 <at> debbugs.gnu.org, Wilko Meyer <w <at> wmeyer.eu>,
 Ashish SHUKLA <ashish.is <at> lostca.se>, Leo Famulari <leo <at> famulari.name>
Subject: [PATCH v2 2/2] gnu: btrfs-progs: Update to 6.13.
Date: Mon, 10 Mar 2025 20:34:19 +0100

* gnu/packages/linux.scm (btrfs-progs): Update to 6.13.
[native-inputs]: Add python-wrapper, and python-sphinx-rtd-theme.

Change-Id: I839f3f20518b632eceaf73cc8c57df7bece1dfb9
---
 gnu/packages/linux.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 690e9e23d5..673f7019df 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6429,7 +6429,7 @@ (define-public gpm
 (define-public btrfs-progs
   (package
     (name "btrfs-progs")
-    (version "6.3.3")
+    (version "6.13")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kernel.org/linux/kernel/"
@@ -6437,7 +6437,7 @@ (define-public btrfs-progs
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0vmrjn3dcmka9rj5b81ag9jwprzyicx05h1ccj0x0w02fqah1qsb"))))
+                "16pffd6wf1pmdw9rgasyq2qf59y6xh764cml2c0gi5552w8z5cv5"))))
     (build-system gnu-build-system)
     (outputs '("out" "static")) ;static versions of the binaries in "out"
     (arguments
@@ -6498,7 +6498,7 @@ (define-public btrfs-progs
       ;; For building documentation.  Since python-sphinx requires Rust, add
       ;; it conditionally depending on such support.
       (if (supported-package? python-sphinx)
-          (list python-sphinx)
+          (list python-wrapper python-sphinx python-sphinx-rtd-theme)
           '())
       (list pkg-config
             acl                                   ;for tests
-- 
2.48.1

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: "Ashish SHUKLA" <ashish.is <at> lostca.se>
Cc: 75119 <at> debbugs.gnu.org, Wilko Meyer <w <at> wmeyer.eu>,
 Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#75119] [PATCH] gnu: e2fsprogs: Update to 1.47.1.
Date: Fri, 14 Mar 2025 00:20:11 +0100

Hi Ashish,

"Ashish SHUKLA" <ashish.is <at> lostca.se> skribis:

> Sure, while here I'm also updating it to its latest version, 6.13.

Making progress.  :-)

--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix build --no-grafts -P1 e2fsprogs -P1 btrfs-progs 
[…]
guix build: error: build of `/gnu/store/0qsdl31a7nz2vpmv78h32fp1vp89rwgh-genimage-18-0.00009af.drv', `/gnu/store/40mwpgnprz01wbsszprmaa8bc7ah3d59-spacefm-1.0.6.drv', `/gnu/store/7ixdhhydzp1dycqzmk7sr55k6xzjq4pk-lxd-4.24.drv', `/gnu/store/dawnvrspcp7vyl58nlsfc0pnb7an4x6l-libblockdev-3.1.1.drv', `/gnu/store/fqxh88cknlizw1k388wpwvyyrg4d6wyl-aegis-4.24.drv', `/gnu/store/isi2miz2rj8jjr2rfwxg7c7dy5ql30f7-compsize-1.5.drv' failed
--8<---------------cut here---------------end--------------->8---

I looked at ‘compsize’: there’s no fix in the upstream repo, so perhaps
we’ll have to leave it like this, unless there are patches in downstream
distros.

Could you take a look at the others though?

Thanks,
Ludo’.

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

From: ashish.is <at> lostca.se
To: ludo <at> gnu.org
Cc: 75119 <at> debbugs.gnu.org, Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v3 1/5] gnu: e2fsprogs: Update to 1.47.1.
Date: Sun, 23 Mar 2025 01:20:32 +0000

From: Ashish SHUKLA <ashish.is <at> lostca.se>

* gnu/packages/linux.scm (e2fsprogs): Update to 1.47.1.

Change-Id: I428973b6a04a99eca96592d79d1bf7da47fd6680
---
 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 1417925dc8..06eab00ab5 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2790,7 +2790,7 @@ (define-public usbip-utils
 (define-public e2fsprogs
   (package
     (name "e2fsprogs")
-    (version "1.47.0")
+    (version "1.47.1")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -2799,7 +2799,7 @@ (define-public e2fsprogs
                    "e2fsprogs-" version ".tar.xz"))
              (sha256
               (base32
-               "1nymjw801lmlr5y6bg1zv9jsip5dkyxqislbdzpir4mx5czzajhl"))))
+               "1lg0k5fh41nl0ldbh76hwdx3g5kqzqyc245vljy88wnlgw2dqcss"))))
     (build-system gnu-build-system)
     (inputs (list `(,util-linux "lib")))
     (native-inputs (list pkg-config
-- 
2.48.1

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

From: ashish.is <at> lostca.se
To: ludo <at> gnu.org
Cc: 75119 <at> debbugs.gnu.org, Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v3 3/5] gnu: genimage: Fix failing test case.
Date: Sun, 23 Mar 2025 01:20:34 +0000

From: Ashish SHUKLA <ashish.is <at> lostca.se>

* gnu/packages/genimage.scm (genimage)[#:phases]
<fix-failing-tests>: Patch another test output.

Change-Id: Ief0857b04ebe2bb527274df87d38325d5d498651
---
 gnu/packages/genimage.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm
index b90adffb67..12ff1e6554 100644
--- a/gnu/packages/genimage.scm
+++ b/gnu/packages/genimage.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2018 Danny Milosavljevic <dannym <at> scratchpost.org>
 ;;; Copyright © 2021 Vincent Legoll <vincent.legoll <at> gmail.com>
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is <at> lostca.se>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -109,7 +110,8 @@ (define-public genimage
                               "test/ext3test.2.dump"
                               "test/ext4test.2.dump"
                               "test/ext2test-percent.2.dump"
-                              "test/mke2fs.2.dump")
+                              "test/mke2fs.2.dump"
+                              "test/mke2fs.3.dump")
                  (("root") "unknown"))))
            (add-before 'check 'setenv-check
              (lambda _
-- 
2.48.1

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

From: ashish.is <at> lostca.se
To: ludo <at> gnu.org
Cc: 75119 <at> debbugs.gnu.org, Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v3 0/5] Re: [bug#75119] [PATCH] gnu: e2fsprogs: Update to
 1.47.1.
Date: Sun, 23 Mar 2025 01:20:31 +0000

From: Ashish SHUKLA <ashish.is <at> lostca.se>

Hi,

I've been able to fix only a few of the dependencies. So far:

- aegis is broken (was before this).
- criu (lxd's dependency) was broken (fixed, and updated).
- lxd is still broken.
- libblockdev is updated.
- genimage is patched to fix failing tests.

Ashish SHUKLA (5):
  gnu: e2fsprogs: Update to 1.47.1.
  gnu: btrfs-progs: Update to 6.13.
  gnu: genimage: Fix failing test case.
  gnu: libblockdev: Update to 3.3.0.
  gnu: criu: Update to 4.0.

 gnu/packages/disk.scm           |  9 ++++++---
 gnu/packages/genimage.scm       |  4 +++-
 gnu/packages/linux.scm          | 10 +++++-----
 gnu/packages/virtualization.scm | 24 +++++++++++++++++++++---
 4 files changed, 35 insertions(+), 12 deletions(-)


base-commit: f6147d476d65d04eba3654c3c9251e1bd6eac21a
-- 
2.48.1

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

From: ashish.is <at> lostca.se
To: ludo <at> gnu.org
Cc: 75119 <at> debbugs.gnu.org, Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v3 4/5] gnu: libblockdev: Update to 3.3.0.
Date: Sun, 23 Mar 2025 01:20:35 +0000

From: Ashish SHUKLA <ashish.is <at> lostca.se>

* gnu/packages/disk.scm (libblockdev): Update to 3.3.0.
[inputs]: Add json-glib-minimal, libatasmart.

Change-Id: I50c167ed0692133c9a36e691911576c283c7bbfe
---
 gnu/packages/disk.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index c19d94760c..f7941a219f 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -30,6 +30,7 @@
 ;;; Copyright © 2023 Morgan Smith <Morgan.J.Smith <at> outlook.com>
 ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus <at> gmail.com>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is <at> lostca.se>
 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1207,15 +1208,15 @@ (define-public dmraid
 (define-public libblockdev
   (package
     (name "libblockdev")
-    (version "3.1.1")
+    (version "3.3.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/storaged-project/"
                                   "libblockdev/releases/download/"
-                                  version "-1/libblockdev-" version ".tar.gz"))
+                                  version "/libblockdev-" version ".tar.gz"))
               (sha256
                (base32
-                "1ny2glwmb5dcdv2x0giinbyma9fhk59z8117k1kr15pm7yjk7jx5"))))
+                "19yzidh8i32327h8h7b9yx86yv1hm7kz1y91cn4gxzyypqd8wwy4"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -1260,8 +1261,10 @@ (define-public libblockdev
             eudev
             glib
             gptfdisk
+            json-glib-minimal
             keyutils
             kmod
+            libatasmart
             libbytesize
             libnvme
             libyaml
-- 
2.48.1

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

From: ashish.is <at> lostca.se
To: ludo <at> gnu.org
Cc: 75119 <at> debbugs.gnu.org, Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v3 2/5] gnu: btrfs-progs: Update to 6.13.
Date: Sun, 23 Mar 2025 01:20:33 +0000

From: Ashish SHUKLA <ashish.is <at> lostca.se>

* gnu/packages/linux.scm (btrfs-progs): Update to 6.13.
[native-inputs]: Add python-wrapper, and python-sphinx-rtd-theme.

Change-Id: I839f3f20518b632eceaf73cc8c57df7bece1dfb9
---
 gnu/packages/linux.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 06eab00ab5..e522f9a03f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6429,7 +6429,7 @@ (define-public gpm
 (define-public btrfs-progs
   (package
     (name "btrfs-progs")
-    (version "6.3.3")
+    (version "6.13")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kernel.org/linux/kernel/"
@@ -6437,7 +6437,7 @@ (define-public btrfs-progs
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0vmrjn3dcmka9rj5b81ag9jwprzyicx05h1ccj0x0w02fqah1qsb"))))
+                "16pffd6wf1pmdw9rgasyq2qf59y6xh764cml2c0gi5552w8z5cv5"))))
     (build-system gnu-build-system)
     (outputs '("out" "static")) ;static versions of the binaries in "out"
     (arguments
@@ -6498,7 +6498,7 @@ (define-public btrfs-progs
       ;; For building documentation.  Since python-sphinx requires Rust, add
       ;; it conditionally depending on such support.
       (if (supported-package? python-sphinx)
-          (list python-sphinx)
+          (list python-wrapper python-sphinx python-sphinx-rtd-theme)
           '())
       (list pkg-config
             acl                                   ;for tests
-- 
2.48.1

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

From: ashish.is <at> lostca.se
To: ludo <at> gnu.org
Cc: 75119 <at> debbugs.gnu.org, Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v3 5/5] gnu: criu: Update to 4.0.
Date: Sun, 23 Mar 2025 01:20:36 +0000

From: Ashish SHUKLA <ashish.is <at> lostca.se>

* gnu/packages/virtualization.scm (criu): Update to 4.0.
[#:phases]<hardcode-variables>: Add a few more substitutions.
<wrap>: Manually install python components. [native-inputs]:
Depend on python-setuptools.

Change-Id: I9fc3a8e554499edd339a89597d0e1438997a24c8
---
 gnu/packages/virtualization.scm | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 9c72e1793f..b5c0c464ac 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2000,7 +2000,7 @@ (define-public vmware-open-vm-tools-gtk
 (define-public criu
   (package
     (name "criu")
-    (version "3.17.1")
+    (version "4.0")
     (source
      (origin
        (method git-fetch)
@@ -2009,7 +2009,7 @@ (define-public criu
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ff3xfcf0wfz02fc0qbj56mci1a0xdl8jzaihaw6qyjvgrsiq7fh"))))
+        (base32 "0p46z5iclyvvg1arvqhl3bdg1g2mny0pxyz6pr5n87cnj7maqphg"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -2040,7 +2040,14 @@ (define-public criu
            (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; Hardcode arm version detection
              (substitute* "Makefile"
-               (("ARMV.*:=.*") "ARMV := 7\n"))
+               (("ARMV.*:=.*") "ARMV := 7\n")
+               (("^head-name :=.*")
+                (string-append "head-name := "
+                               ,(package-version this-package)
+                               "\n")))
+             ;; disable pip install
+             (substitute* "Makefile.install"
+               (("SKIP_PIP_INSTALL.*:=.*") "SKIP_PIP_INSTALL := 1\n"))
              ;; Hard-code the correct PLUGINDIR above.
              (substitute* "criu/include/plugin.h"
                (("/var") (string-append (assoc-ref outputs "out"))))))
@@ -2066,6 +2073,16 @@ (define-public criu
                                            (package-version python))
                                          "/site-packages"))
                     (path (getenv "GUIX_PYTHONPATH")))
+               ;; manually install stuff that was pip-installed
+               (for-each (lambda (dir)
+                          (with-directory-excursion dir
+                            (setenv "GUIX_PYTHONPATH"
+                              (string-append site ":" path))
+                            (invoke "python3" "setup.py" "install"
+                              (string-append "--prefix=" out)
+                              "--no-compile" "--root=/"
+                              "--single-version-externally-managed")))
+                         (list "lib" "crit"))
                (wrap-program (string-append out "/bin/crit")
                  `("GUIX_PYTHONPATH" ":" prefix (,site ,path))))))
          (add-after 'install 'delete-static-libraries
@@ -2091,6 +2108,7 @@ (define-public criu
            xmlto
            docbook-xml
            docbook-xsl
+           python-setuptools
            python-toolchain))
     (propagated-inputs
      ;; included by 'rpc.pb-c.h'
-- 
2.48.1

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: ashish.is <at> lostca.se
Cc: 75119-done <at> debbugs.gnu.org, Sharlatan Hellseher <sharlatanus <at> gmail.com>
Subject: Re: [bug#75119] [PATCH v3 0/5] Re: [bug#75119] [PATCH] gnu:
 e2fsprogs: Update to 1.47.1.
Date: Tue, 01 Apr 2025 14:45:55 +0200

Hello,

ashish.is <at> lostca.se skribis:

> I've been able to fix only a few of the dependencies. So far:
>
> - aegis is broken (was before this).
> - criu (lxd's dependency) was broken (fixed, and updated).
> - lxd is still broken.
> - libblockdev is updated.
> - genimage is patched to fix failing tests.
>
> Ashish SHUKLA (5):
>   gnu: e2fsprogs: Update to 1.47.1.
>   gnu: btrfs-progs: Update to 6.13.
>   gnu: genimage: Fix failing test case.
>   gnu: libblockdev: Update to 3.3.0.
>   gnu: criu: Update to 4.0.

Finally applied v3, thank you!

Ludo’.

Previous Next

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