diff options
| author | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:53:44 +0200 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:53:44 +0200 |
| commit | 1828958db52d0019a7f3d763b07e64f78afa2cbf (patch) | |
| tree | 8bdff27c5b3dc088d923e91a14a38f6a6b9fa661 /gnu/packages/patches/genimage-signedness.patch | |
| parent | 7e463dd16b7e273011f0beafa57a89fa2d525f8b (diff) | |
| parent | 23744435613aa040beacc61a0825cc72280da80a (diff) | |
| download | guix-1828958db52d0019a7f3d763b07e64f78afa2cbf.tar.gz guix-1828958db52d0019a7f3d763b07e64f78afa2cbf.zip | |
Merge branch 'wip-lisp' into staging
Diffstat (limited to 'gnu/packages/patches/genimage-signedness.patch')
| -rw-r--r-- | gnu/packages/patches/genimage-signedness.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/patches/genimage-signedness.patch b/gnu/packages/patches/genimage-signedness.patch new file mode 100644 index 0000000000..2204dfb545 --- /dev/null +++ b/gnu/packages/patches/genimage-signedness.patch @@ -0,0 +1,24 @@ +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 |