[PATCH] gnu: genimage: Update to 11.

DoneSubmitted by Vincent Legoll.
3 participants
  • Danny Milosavljevic
  • Mathieu Othacehe
  • Vincent Legoll
Vincent Legoll wrote on 30 Mar 2020 20:34
(address . guix-patches@gnu.org)
here is an update to version 11 for genimage,this is not the latest, as there is a test suitefailure for version 12 that I cannot understand.
The output for this test failure is in the attachedlog file.
It looks like the created image uses 2 filesystemblock more than the expected, and so the bitmapchecksum changes, etc.
Danny, you close the issue:https://github.com/pengutronix/genimage/issues/36what was the outcome ?
I want to have your word on this before creating anissue upstream, if we can solve it on our side.
So, until this test suite failure is solved we can stillget the version 11 in...
-- Vincent Legoll
expecting success: run_genimage mke2fs.config mke2fs.ext4 && check_ext images/mke2fs.ext4 mke2fs 335544321+0 records in1+0 records out1048576 bytes (1.0 MB, 1.0 MiB) copied, 0.00112043 s, 936 MB/sINFO: cmd: "mkdir -p "/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/tmp"" (stderr+stdout):INFO: cmd: "rm -rf "/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/tmp"/*" (stderr+stdout):INFO: cmd: "mkdir -p "/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/tmp"" (stderr+stdout):INFO: cmd: "cp -a "/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/root" "/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/tmp/root"" (stderr+stdout):INFO: cmd: "find '/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/tmp/root' -depth -type d -printf '%P\0' | xargs -0 -I {} touch -r '/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/root/{}' '/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/tmp/root/{}'" (stderr+stdout):INFO: cmd: "mkdir -p "/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/images"" (stderr+stdout):INFO: ext4(mke2fs.ext4): cmd: "MKE2FS_CONFIG="mke2fs.conf" mke2fs -E no_copy_xattrs -t ext4 -E 'root_owner=0:0,lazy_itable_init=0,lazy_journal_init=0' -O '^large_file' -O '^huge_file' -d '/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/tmp/root' -U 12345678-1234-1234-1234-1234567890ab -L mke2fs -O '^resize_inode,quota' '/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/images/mke2fs.ext4' 32768" (stderr+stdout):mke2fs 1.45.5 (07-Jan-2020)Discarding device blocks: done Creating filesystem with 32768 1k blocks and 8192 inodesFilesystem UUID: 12345678-1234-1234-1234-1234567890abSuperblock backups stored on blocks: 8193, 24577
Allocating group tables: done Writing inode tables: done Creating journal (4096 blocks): doneCopying files into the device: doneWriting superblocks and filesystem accounting information: done
INFO: ext4(mke2fs.ext4): cmd: "/gnu/store/6lqcz57c2r06p3ggjr81c9h88afddgzq-e2fsprogs-1.45.5/sbin/e2fsck -pvfD '/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/images/mke2fs.ext4'" (stderr+stdout):[QUOTA WARNING] Missing quota entry ID 999mke2fs: Update quota info for quota type 0.[QUOTA WARNING] Missing quota entry ID 30000mke2fs: Update quota info for quota type 1.
51 inodes used (0.62%, out of 8192) 2 non-contiguous files (3.9%) 0 non-contiguous directories (0.0%) # of inodes with ind/dind/tind blocks: 0/0/0 Extent depth histogram: 45 5178 blocks used (15.80%, out of 32768) 0 bad blocks 0 large files
24 regular files 18 directories 0 character device files 0 block device files 0 fifos 0 links 0 symbolic links (0 fast symbolic links) 0 sockets------------ 42 filesINFO: ext4(mke2fs.ext4): cmd: "echo 'set_current_time 20000101000000set_super_value mkfs_time 20000101000000set_super_value lastcheck 20000101000000set_super_value mtime 00000000' | /gnu/store/6lqcz57c2r06p3ggjr81c9h88afddgzq-e2fsprogs-1.45.5/sbin/debugfs -w '/tmp/guix-build-genimage-12.drv-0/source/trash directory.basic-images.test/images/mke2fs.ext4'" (stderr+stdout):debugfs 1.45.5 (07-Jan-2020)debugfs: Setting current time to Sat Jan 1 00:00:00 2000
debugfs: debugfs: debugfs: debugfs: ++ uuid='Filesystem UUID'++ seed='Directory Hash Seed:'++ csum1='Checksum: \|Group 0: (Blocks 1-4095) csum'++ csum2='Group 0: (Blocks 1-4095) \[ITABLE_ZEROED\]\| Checksum .*, unused inodes 205'++ dumpe2fs images/mke2fs.ext4++ grep -v '^\(Filesystem UUID\|Directory Hash Seed:\|Checksum: \|Group 0: (Blocks 1-4095) csum\|Group 0: (Blocks 1-4095) \[ITABLE_ZEROED\]\| Checksum .*, unused inodes 205\)'dumpe2fs 1.45.5 (07-Jan-2020)++ sed -i 's/^\(Journal size: \)1029k$/\11024k/' dump++ sed -i 's/^\( Block bitmap at .*\),\( Inode bitmap.*\)$/\1\n \2/' dump++ test_cmp /tmp/guix-build-genimage-12.drv-0/source/test/mke2fs.dump dump++ diff -u /tmp/guix-build-genimage-12.drv-0/source/test/mke2fs.dump dump
--- /tmp/guix-build-genimage-12.drv-0/source/test/mke2fs.dump 2020-03-28 14:27:56.448000000 +0000+++ dump 2020-03-28 14:28:01.692000000 +0000@@ -11,7 +11,7 @@ Inode count: 8192 Block count: 32768 Reserved block count: 1638-Free blocks: 27592+Free blocks: 27590 Free inodes: 8141 First block: 1 Block size: 1024@@ -29,7 +29,7 @@ Maximum mount count: -1 Last checked: Sat Jan 1 00:00:00 2000 Check interval: 0 (<none>)-Lifetime writes: 123 kB+Lifetime writes: 125 kB Reserved blocks uid: 0 (user unknown) Reserved blocks gid: 0 (group unknown) First inode: 11@@ -47,13 +47,13 @@ Journal start: 0 -Group 0: (Blocks 1-8192) csum 0x62cb [ITABLE_ZEROED]+Group 0: (Blocks 1-8192) csum 0xe083 [ITABLE_ZEROED] Primary superblock at 1, Group descriptors at 2-2- Block bitmap at 3 (+2), csum 0xb4967804+ Block bitmap at 3 (+2), csum 0x0fddd371 Inode bitmap at 7 (+6), csum 0xb1052088 Inode table at 11-266 (+10)- 7117 free blocks, 1997 free inodes, 18 directories, 1997 unused inodes- Free blocks: 1076-8192+ 7115 free blocks, 1997 free inodes, 18 directories, 1997 unused inodes+ Free blocks: 1078-8192 Free inodes: 52-2048 Group 1: (Blocks 8193-16384) csum 0x7d4b [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]++ func_check++ local ret=1++ set +xFailed to execute 'check_ext'! Backup superblock at 8193, Group descriptors at 8194-8194not ok 7 - mke2fsFAIL: test/basic-images.test 7 - mke2fs
From e64a6703fa1bbe79364df14848870fdc988745c9 Mon Sep 17 00:00:00 2001From: Vincent Legoll <vincent.legoll@gmail.com>Date: Fri, 27 Mar 2020 22:10:06 +0100Subject: [PATCH] gnu: genimage: Update to 11.
* gnu/packages/genimage.scm (genimage): Update to 11.[arguments]: add a new test dump file to the patched onesbecause of missing /etc/passwd in build environment.--- gnu/packages/genimage.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Toggle diff (32 lines)diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scmindex fdf686f9d7..27f55a398a 100644--- a/gnu/packages/genimage.scm+++ b/gnu/packages/genimage.scm@@ -41,7 +41,7 @@ (define-public genimage (package (name "genimage")- (version "10")+ (version "11") (source (origin (method git-fetch) (uri (git-reference@@ -50,7 +50,7 @@ (file-name (string-append name "-" version "-checkout")) (sha256 (base32- "0had00p2why2l1fl14mq7nbhmmfbd3na4qnnpg36akdy05g67jbn"))))+ "15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54")))) (build-system gnu-build-system) (arguments `(#:phases@@ -149,6 +149,7 @@ (substitute* '("test/ext2test.dump" "test/ext3test.dump" "test/ext4test.dump"+ "test/ext2test-percent.dump" "test/mke2fs.dump") (("root") "unknown")) #t))-- 2.25.2
Danny Milosavljevic wrote on 30 Mar 2020 22:47
(name . Vincent Legoll)(address . vincent.legoll@gmail.com)(address . 40331@debbugs.gnu.org)
On Mon, 30 Mar 2020 20:34:42 +0200Vincent Legoll <vincent.legoll@gmail.com> wrote:
Toggle quote (7 lines)> Danny, you close the issue:> https://github.com/pengutronix/genimage/issues/36> what was the outcome ?> > I want to have your word on this before creating an> issue upstream, if we can solve it on our side.
I can't remember. I *think* it was because one of our tools had xattr supportand another one of our tools had no xattr support, so the xattrs would get lostand that would change the image or something.
iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl6CWtEACgkQ5xo1VCwwuqWqSggAmEPVGRWq590GKl4ih6ooU7yYXlD5Y5kGJZq/KACrOzTKVayRZPKrut0L0RpAB6C0aL6iipaq4r5MGFNKbLitER9B797MC5RJZSZ7Udy2nbD3ayTUTBg0bTtPAn5XwlfpQN9OmT7/6NW7fFF0Xtg5DwCB9ZM/b9+N9SakTM45FDvnRKgSj2X6wWJSwY7uys4BRMJMMJfKjpfdGfDJCR1JjnEtA3Y91B+Fn46gp1YSM2+UsgNDTpC93NUSMYdKa13j1JXUdagydnQPJqKw48IdMl8l39gudJvPbYAykU3Ga15zOjosvxY0SjDtlDKKvNg/+isyrCWov13sC+biWJ3UPg===ZnH+-----END PGP SIGNATURE-----

Mathieu Othacehe wrote on 8 Apr 2020 11:30
(name . Vincent Legoll)(address . vincent.legoll@gmail.com)(address . 40331@debbugs.gnu.org)
Hello Vincent,
Toggle quote (4 lines)> here is an update to version 11 for genimage,> this is not the latest, as there is a test suite> failure for version 12 that I cannot understand.
Till we find a solution for v12 test failures, I applied your update tov11.
Thanks for this patch,
Mathieu Othacehe wrote on 8 Apr 2020 11:32
(name . Vincent Legoll)(address . vincent.legoll@gmail.com)(address . 40331-done@debbugs.gnu.org)
And closing!
Danny Milosavljevic wrote on 4 May 2020 19:30
Re: [PATCH] gnu: genimage: Update to 12.
(name . Vincent Legoll)(address . vincent.legoll@gmail.com)(address . 40331@debbugs.gnu.org)
Aha, guix bug 41081 maybe? cp is built without xattr support.
iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl6wUSUACgkQ5xo1VCwwuqUWYQf/UxZY6GhgchSLUdYBvX/d1Dg0N2QYDqUPtJ+q9ENb2jGuMFrxLcQudeT2aCru5oZ5hiEE/bB8i71pxhueoa0VFAEE5+17+fXwk64kTOwtmcc5C/eyGcaUXP2Ni5qeSKfC1u6eV1Ph1sHkjvlDbgtP3l9H7GwPy2sICaLcQkvJqON+dOZ0oFQKxbtorr4wMAY/A12ICvoqa4oR56VqMHZuVdOgTkFBAa6b2ZIPbdT6TVZTEuq4yvITRLvx+NA4vOtyppDPWm5vjIfPifaQH2kdNLdMKQn8xbZJwyC9lXI8qPxI+mRd0RK57nii7MYc5/ZYlavL8sm8CDcx+ilDlhN7yQ===ySkM-----END PGP SIGNATURE-----

Vincent Legoll wrote on 21 May 2020 21:51
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)(address . 40331@debbugs.gnu.org)
On 04/05/2020 19:30, Danny Milosavljevic wrote:
Toggle quote (2 lines)> Aha, guix bug 41081 maybe? cp is built without xattr support.
I tried to build the new genimage with a coreutils-with-xattr,but am still getting a test suite failure. I'll have to digdeeper.
-- Vincent Legoll