[bug#70912] [PATCH] gnu: e2fsprogs: Downgrade to 1.46.6.

[Zheng Junjie]

Efraim Flashner <efraim@flashner.co.il> writes:

> Considering there was a second commit to fix this from the grub side I
> think we can upgrade e2fsprogs back to 1.47.0. Do you want to do it? I
> won't be able to for a few days.
>
> On May 31, 2024 2:24:26 PM UTC, Zheng Junjie <zhengjunjie@iscas.ac.cn> wrote:
>>Efraim Flashner <efraim@flashner.co.il> writes:
>>
>>> 1.47.0 would, by default, create an ext4 filesystem which was not
>>> readable by our current version of grub.  This should also address a
>>> number of the system test failures.
>>>
>>> * gnu/packages/linux.scm (e2fsprogs): Downgrade to 1.46.6.
>>>
>>> Change-Id: Ifa6841185ab85d24479f981afc1b42a349716d80
>>> ---
>>>  gnu/packages/linux.scm | 6 ++++--
>>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
>>> index 2e0c05b4f7..76c69701b8 100644
>>> --- a/gnu/packages/linux.scm
>>> +++ b/gnu/packages/linux.scm
>>> @@ -2548,10 +2548,12 @@ (define-public usbip-utils
>>>  module.")
>>>      (license license:gpl2)))
>>>  
>>> +;; XXX: Before updating to 1.47+ check if grub supports the ext4 flag
>>> +;; metadata_csum_seed, otherwise grub will complain about an unknown 
>>> filesystem.
>>>  (define-public e2fsprogs
>>>    (package
>>>      (name "e2fsprogs")
>>> -    (version "1.47.0")
>>> +    (version "1.46.6")
>>>      (source (origin
>>>               (method url-fetch)
>>>               (uri (string-append
>>> @@ -2560,7 +2562,7 @@ (define-public e2fsprogs
>>>                     "e2fsprogs-" version ".tar.xz"))
>>>               (sha256
>>>                (base32
>>> -               "1nymjw801lmlr5y6bg1zv9jsip5dkyxqislbdzpir4mx5czzajhl"))))
>>> +               "1z7lqkvrw97jym2w2gz1aj3d9maxhrk6alv3vrzfkr7mkzqifxd7"))))
>>>      (build-system gnu-build-system)
>>>      (inputs (list `(,util-linux "lib")))
>>>      (native-inputs (list pkg-config
>>>
>>> base-commit: 56980ea500a1db3c8586972b8abfaf5c4e24f82d
>>hello, this downgrade make my visionfive2 boot fail,
>>
>>#+begin_src bash
>>
>>/dev/mmcblk1p3 has unsupported feature(s): FEATURE_C12
>>e2fsck: Get a newer version of e2fsck!
>>
>>Guix_image: ********** WARNING: Filesystem still has errors **********
>>
>>File system check on /dev/mmcblk1p3 failed
>>
>>#+end_src
>>i think maybe we should use 1.47.0 and disable metadata_csum_seed by
>>default, like debian and gentoo?
>>
>>see 
>>https://sources.debian.org/data/main/e/e2fsprogs/1.47.0-2/debian/patches/disable-metadata_csum_seed-and-orphan_file-by-default
>>and 
>>https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=747be80bc0594b776e233912ce517b38d5726891

I don't have a grub + ext4 machine now, but it seems to me that I should only 
need to Revert this commit?

From 946991731da55ce5c1c541b1e118340d5a531be4 Mon Sep 17 00:00:00 2001
Message-ID: 
<946991731da55ce5c1c541b1e118340d5a531be4.1717167184.git.zhengjunjie@iscas.ac.cn>
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Date: Fri, 31 May 2024 22:51:04 +0800
Subject: [PATCH] Revert "gnu: e2fsprogs: Downgrade to 1.46.6."

This reverts commit dd8364cfae6f666187eda62684cdbcd704fd9081.

Commit 00384aedbc6a371aaf90ca344a446952fdd5a6b3 let grub ignore
metadata-csum-seed, so we can update to 1.47+.
---
 gnu/packages/linux.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3129c5a073..0a9b31685d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2640,12 +2640,10 @@ (define-public usbip-utils
 module.")
     (license license:gpl2)))
 
-;; XXX: Before updating to 1.47+ check if grub supports the ext4 flag
-;; metadata_csum_seed, otherwise grub will complain about an unknown 
filesystem.
 (define-public e2fsprogs
   (package
     (name "e2fsprogs")
-    (version "1.46.6")
+    (version "1.47.0")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -2654,7 +2652,7 @@ (define-public e2fsprogs
                    "e2fsprogs-" version ".tar.xz"))
              (sha256
               (base32
-               "1z7lqkvrw97jym2w2gz1aj3d9maxhrk6alv3vrzfkr7mkzqifxd7"))))
+               "1nymjw801lmlr5y6bg1zv9jsip5dkyxqislbdzpir4mx5czzajhl"))))
     (build-system gnu-build-system)
     (inputs (list `(,util-linux "lib")))
     (native-inputs (list pkg-config

base-commit: 83d29d56f8808ca1f076dda37ef34150d0308e9a
-- 
2.41.0

signature.asc
Description: PGP signature