diff options
| author | Ryan Sundberg <ryan@arctype.co> | 2021-11-04 01:35:10 -0700 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-11-12 12:02:32 +0000 |
| commit | 39754503e83f5f50ee25a2bcbac41d5bc436f7aa (patch) | |
| tree | 69880cb532add2fd2356feda7f8af49d39f1ace3 /gnu/packages/patches/genimage-mke2fs-test.patch | |
| parent | 6e67c701a88064babd1aef93b58890aed2dcd0aa (diff) | |
| download | guix-patches-39754503e83f5f50ee25a2bcbac41d5bc436f7aa.tar guix-patches-39754503e83f5f50ee25a2bcbac41d5bc436f7aa.tar.gz | |
gnu: genimage: Update to 14.
Update genimage from version 11 to 14. A patch is required for the
tests due to differences in ext tooling.
* gnu/local.mk (dist_patch_DATA): Replace patch reference.
* gnu/packages/genimage.scm: Update package source.
* gnu/packages/patches/genimage-mke2fs-test.patch: New patch file.
* gnu/packages/patches/genimage-signedness.patch: Delete obsolete patch.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Diffstat (limited to 'gnu/packages/patches/genimage-mke2fs-test.patch')
| -rw-r--r-- | gnu/packages/patches/genimage-mke2fs-test.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/gnu/packages/patches/genimage-mke2fs-test.patch b/gnu/packages/patches/genimage-mke2fs-test.patch new file mode 100644 index 0000000000..c4a17590f2 --- /dev/null +++ b/gnu/packages/patches/genimage-mke2fs-test.patch @@ -0,0 +1,40 @@ +diff --git a/test/mke2fs.dump b/test/mke2fs.dump +index 8e63662..0c25798 100644 +--- a/test/mke2fs.dump ++++ b/test/mke2fs.dump +@@ -11,7 +11,7 @@ Filesystem OS type: Linux + Inode count: 8192 + Block count: 32768 + Reserved block count: 1638 +-Free blocks: 26568 ++Free blocks: 26566 + Free inodes: 8141 + First block: 1 + Block size: 1024 +@@ -29,7 +29,7 @@ Mount count: 0 + Maximum mount count: -1 + Last checked: Sat Jan 1 00:00:00 2000 + Check interval: 0 (<none>) +-Lifetime writes: 141 kB ++Lifetime writes: 143 kB + Reserved blocks uid: 0 (user root) + Reserved blocks gid: 0 (group root) + First inode: 11 +@@ -49,13 +49,13 @@ Journal sequence: 0x00000001 + Journal start: 0 + + +-Group 0: (Blocks 1-8192) csum 0x74a0 [ITABLE_ZEROED] ++Group 0: (Blocks 1-8192) csum 0x3f30 [ITABLE_ZEROED] + Primary superblock at 1, Group descriptors at 2-2 +- Block bitmap at 3 (+2), csum 0x16cec4db ++ Block bitmap at 3 (+2), csum 0x8d67cdef + Inode bitmap at 7 (+6), csum 0xb1052088 + Inode table at 11-522 (+10) +- 6093 free blocks, 1997 free inodes, 18 directories, 1997 unused inodes +- Free blocks: 2100-8192 ++ 6091 free blocks, 1997 free inodes, 18 directories, 1997 unused inodes ++ Free blocks: 2102-8192 + Free inodes: 52-2048 + Group 1: (Blocks 8193-16384) csum 0x8fde [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED] + Backup superblock at 8193, Group descriptors at 8194-8194 |