From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gO2iMHmbg2FdNgEAgWs5BA (envelope-from ) for ; Thu, 04 Nov 2021 09:36:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yAlhLHmbg2GFPAAA1q6Kng (envelope-from ) for ; Thu, 04 Nov 2021 08:36:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4959D32E5C for ; Thu, 4 Nov 2021 09:36:09 +0100 (CET) Received: from localhost ([::1]:32860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miYEC-0007sl-F6 for larch@yhetil.org; Thu, 04 Nov 2021 04:36:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miYE7-0007qF-HH for guix-patches@gnu.org; Thu, 04 Nov 2021 04:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miYE7-0008Jw-8z for guix-patches@gnu.org; Thu, 04 Nov 2021 04:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1miYE7-00074X-7M for guix-patches@gnu.org; Thu, 04 Nov 2021 04:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51599] [PATCH 1/2] gnu: genimage: upgrade to v14 Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Nov 2021 08:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51599 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51599@debbugs.gnu.org Cc: Ryan Sundberg X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163601494627141 (code B ref -1); Thu, 04 Nov 2021 08:36:03 +0000 Received: (at submit) by debbugs.gnu.org; 4 Nov 2021 08:35:46 +0000 Received: from localhost ([127.0.0.1]:41967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miYDp-00073h-RV for submit@debbugs.gnu.org; Thu, 04 Nov 2021 04:35:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:34466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miYDl-00073K-Fp for submit@debbugs.gnu.org; Thu, 04 Nov 2021 04:35:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miYDl-0007pV-5A for guix-patches@gnu.org; Thu, 04 Nov 2021 04:35:41 -0400 Received: from mail.arctype.co ([138.68.9.245]:58037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miYDi-0008D0-Jx for guix-patches@gnu.org; Thu, 04 Nov 2021 04:35:40 -0400 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id 43D0713B22D; Thu, 4 Nov 2021 08:35:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=arctype.co; s=mail; t=1636014933; bh=1C4gjT8md6i7AdUkPewBQoMcudPSQa8PAGV7pB5XC0Y=; h=From:To:Cc:Subject:Date:From; b=jVnTwKHU7PV3oOqWn+59XLQpS4Am143GZGEBy6aGEb/rMLKjWssoKFHjXdNLo/Q/j WmB0ojfujUSEfAbdJfbmbEOmbS6pC2sUHKBmhTQYQGCQNom8iuRdAwfweKQRA7L2bp 06sWb8Qpz15evTx6Jml0fFdBawsRdv+Xyivb3tZGzSz3CdwKFmZ3DqOllkjubQ+5+2 /ygch8Vw4MAl0T6wy+n+lNqOAiK1l2HdMdKq2rGKYOwJ6kjTfIkN5ezacDbWHe9IL3 /B1G6dieGTBCQOPBvBfpYl6QC6U4WOFV7ZLKYM5ZgpnIBzIKHmoSukT4chhQKHaV95 naS+A6GP0KHDw== Date: Thu, 4 Nov 2021 01:35:10 -0700 Message-Id: <20211104083511.11852-1-ryan@arctype.co> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=138.68.9.245; envelope-from=ryan@arctype.co; helo=mail.arctype.co X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Ryan Sundberg X-ACL-Warn: , Ryan Sundberg via Guix-patches From: Ryan Sundberg via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1636014969; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=iZs+hckzYI4FIohNWm76B7uZscft7oWrjcQbGaAcsEk=; b=ENkGv110Ing7Fj/ynMm+fItrmALnAzctBbzCMJl3nchivxxAwKej2VqiwKJF7QgsNxSan8 jpMqJ+6Unulz1lSfEScYLc3Shy24lqSrW/m3udASU4Yl8CX95L6c1cowerChmDf5PA9la1 dFKq8mhtKhQqqW821Q86JKb9z/NEE/c1lvh90WYGQAt3621uZFQ1BSvL85Mz5JPTHOleGC cCWalDKUepcCoNO3k8Nx22RJpRCpL16Zo4GU/2QGorKypdx3JPVDVHyGhvaB7UI5Rbph9P Ll3OsB6ieM0xpKxeEFlVIvz95k9Ov1MV3SdxynDrLeHuVXuGGl99iyvCyt42tQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1636014969; a=rsa-sha256; cv=none; b=gPZGtPp0uw7lafNh2ljr0G0Y0GuI8JnWn8A2jLBuKGjD72tUqt3KdpeCqVlSwfV8Zraths QiZB2+gmQJLp9WN9r4I/ryLO8cHLSJr6ptvppJ3vEztOstv0CjcG9H2cAfhCH/rJ67/azP YGLxkBYQXlQRndL1mdjanKkAamzeS9OZogw0Kd2ONtoZgAoICtIDjMgfxPmqbPXK6TDdNr Y+yn3vQDPq/WJ3OUTTclEegOQmK7Xk4maG9zRYZxX+c92gY/8sS5CFpZdxm5iY7v9g49zs 55lswxDs92IVtGxicKKIgB1yInFqncXvSyexEHkRL67XeWWj2MwMlaKrSxLmhQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=arctype.co header.s=mail header.b=jVnTwKHU; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=arctype.co header.s=mail header.b=jVnTwKHU; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 4959D32E5C X-Spam-Score: -1.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: vJr3XrODXmUC Upgrades genimage from version 11 to 14. A patch is required for the tests due to differences in ext tooling. * gnu/local.mk: 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 --- gnu/local.mk | 2 +- gnu/packages/genimage.scm | 8 ++-- .../patches/genimage-mke2fs-test.patch | 40 +++++++++++++++++++ .../patches/genimage-signedness.patch | 24 ----------- 4 files changed, 45 insertions(+), 29 deletions(-) create mode 100644 gnu/packages/patches/genimage-mke2fs-test.patch delete mode 100644 gnu/packages/patches/genimage-signedness.patch diff --git a/gnu/local.mk b/gnu/local.mk index 17d8cb60e0..d550cff648 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1112,7 +1112,7 @@ dist_patch_DATA = \ %D%/packages/patches/gdk-pixbuf-CVE-2020-29385.patch \ %D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/geary-CVE-2020-24661.patch \ - %D%/packages/patches/genimage-signedness.patch \ + %D%/packages/patches/genimage-mke2fs-test.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 bd77e4dc33..366ff62ab4 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -42,7 +42,7 @@ (define-public genimage (package (name "genimage") - (version "11") + (version "14") (source (origin (method git-fetch) (uri (git-reference @@ -51,9 +51,9 @@ (file-name (git-file-name name version)) (sha256 (base32 - "15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54")) - ;; will be shipped with release 14 - (patches (search-patches "genimage-signedness.patch")))) + "1l45djpbaffhyw0allq3mgzwrdilk05iyj0nvp8l3s47vnp5bnbs")) + ;; Different version of ext4 + (patches (search-patches "genimage-mke2fs-test.patch")))) (build-system gnu-build-system) (arguments `(#:phases 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 () +-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 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 -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 - -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 -- 2.31.1