diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/patches/genimage-signedness.patch | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
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 <[email protected]> -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 <[email protected]> - -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 |