diff options
| author | Andreas Enge <andreas@enge.fr> | 2020-09-08 22:28:18 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2020-09-08 22:29:32 +0200 |
| commit | ee7a7c9014f7dd238ab42d15ef3f5f1fe187d1c3 (patch) | |
| tree | 0e7c2279883eb4a4064b4161dd79b6ce10592c21 | |
| parent | 44de399151c49fdf512e092ffd37ee25d08280be (diff) | |
| download | guix-ee7a7c9014f7dd238ab42d15ef3f5f1fe187d1c3.tar.gz | |
genimage: Add patch needed for the test on ARM architectures.
* gnu/packages/patches/genimage-signedness.patch: New file. * gnu/packages/genimage.scm (genimage)[source]: Add patch. * gnu/local.mk (dist_patch_DATA): Register patch.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/genimage.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/genimage-signedness.patch | 24 |
3 files changed, 28 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index dd15126b26..7c370a1d11 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1017,6 +1017,7 @@ dist_patch_DATA = \ %D%/packages/patches/gd-brect-bounds.patch \ %D%/packages/patches/gdb-hurd.patch \ %D%/packages/patches/gdm-default-session.patch \ + %D%/packages/patches/genimage-signedness.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index 2525c50b48..c9ed6258a0 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -50,7 +50,9 @@ (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54")))) + "15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54")) + ;; will be shipped with release 14 + (patches (search-patches "genimage-signedness.patch")))) (build-system gnu-build-system) (arguments `(#:phases 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 |