diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-11-17 23:24:42 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-11-17 23:43:14 +0100 |
| commit | 3a317f7476f8c6012e166ff9f340f861938721c9 (patch) | |
| tree | 946e398c37912cfc03be7306951ae87bfeb130fa /gnu/packages/patches/genimage-signedness.patch | |
| parent | e55547bf70384691712047912c793c517debd2ec (diff) | |
| parent | 62e707d67caf1dab2af411a69ff8cec4b2dc686e (diff) | |
| download | guix-3a317f7476f8c6012e166ff9f340f861938721c9.tar.gz | |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/patches/genimage-signedness.patch')
| -rw-r--r-- | gnu/packages/patches/genimage-signedness.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/gnu/packages/patches/genimage-signedness.patch b/gnu/packages/patches/genimage-signedness.patch deleted file mode 100644 index 2204dfb545..0000000000 --- a/gnu/packages/patches/genimage-signedness.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 6574665f9d6c0757e8f55ccb465afbcaa90bf019 -Author: Timotej Lazar <timotej.lazar@araneo.si> -Date: Wed Aug 19 19:36:02 2020 +0200 - - test: normalize flags reported by dumpe2fs - - Filesystem flags depend on the system – usually signed_directory_hash, - but unsigned_directory_hash at least on arm64. - - Signed-off-by: Timotej Lazar <timotej.lazar@araneo.si> - -diff --git a/test/basic-images.test b/test/basic-images.test -index f6685e1..cb104c3 100755 ---- a/test/basic-images.test -+++ b/test/basic-images.test -@@ -158,6 +158,8 @@ check_ext() { - # format change - csum2="Group 0: (Blocks 1-4095) \\[ITABLE_ZEROED\\]\| Checksum .*, unused inodes 205" - dumpe2fs "${1}" | grep -v "^\($uuid\|$seed\|$csum1\|$csum2\)" > "dump" && -+ # some architectures (including arm64) use unsigned char -+ sed -i 's/un\(signed_directory_hash\)/\1/' "dump" && - # fixup for ext3 journal size with old tune2fs - sed -i 's/^\(Journal size: \)1029k$/\11024k/' "dump" && - # output format changed with some version |