From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CPglEcjcM2IMpgAAgWs5BA (envelope-from ) for ; Fri, 18 Mar 2022 02:13:44 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id CO6qCcjcM2IkIAAAG6o9tA (envelope-from ) for ; Fri, 18 Mar 2022 02:13:44 +0100 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 C9CB43BEA4 for ; Fri, 18 Mar 2022 02:13:43 +0100 (CET) Received: from localhost ([::1]:48824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nV1BW-000547-O4 for larch@yhetil.org; Thu, 17 Mar 2022 21:13:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nV1At-00052v-9s for guix-patches@gnu.org; Thu, 17 Mar 2022 21:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nV1At-0000xr-1H for guix-patches@gnu.org; Thu, 17 Mar 2022 21:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nV1As-0003Ym-R4 for guix-patches@gnu.org; Thu, 17 Mar 2022 21:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54440] [PATCH 2/2] gnu: genimage: Update to 15. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Mar 2022 01:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 54440@debbugs.gnu.org Received: via spool by 54440-submit@debbugs.gnu.org id=B54440.164756598013669 (code B ref 54440); Fri, 18 Mar 2022 01:13:02 +0000 Received: (at 54440) by debbugs.gnu.org; 18 Mar 2022 01:13:00 +0000 Received: from localhost ([127.0.0.1]:55745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV1Aq-0003YO-86 for submit@debbugs.gnu.org; Thu, 17 Mar 2022 21:13:00 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:60308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV1Ap-0003Y7-4A for 54440@debbugs.gnu.org; Thu, 17 Mar 2022 21:12:59 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 4F5211ABC7 for <54440@debbugs.gnu.org>; Thu, 17 Mar 2022 18:12:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1647565973; bh=MOJHRpEyMQGHrJv8ATJLhgwl72No4j8Dz8z6Ik5olbk=; h=From:To:Subject:In-Reply-To:References:Date:From; b=cr2yhJGgnolcDTXFv5zDUYNuEcGN8n8lDzr6ftoe+BMB4X9rsWJ+Dlb+VTbDjrYpY JHMv/Eu2aeLGymJEbLXDLNkxG751PPhcjufo1S0bCUBVBh15/W10GEsMKDFE2FW+mg crq815aM2fkkX1GPq3Er2/7crK+i7L8AzuV9qxK181MZJEKShRMnRN3Gp5RrwxIwbG Em2iQo3WoNDgmoYoGSrp7CZrQAlsg38ruFcWy4XDZlYJdNS2S2uo8VkqYeJlVXMBKA HUTAk3PSqgwadh1IEdC2VM7bS39qbAyU8oDbL+jzH9KO3VRnDBVoybrMPkDBn7BrIo rrYyY7zE92BBQ== From: Vagrant Cascadian In-Reply-To: <87lex8t67m.fsf@contorta> References: <87sfrgt7ou.fsf@contorta> <87lex8t67m.fsf@contorta> Date: Thu, 17 Mar 2022 18:12:47 -0700 Message-ID: <87ilsct65s.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1647566023; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=V6JENv98FsfBOxpeKXDvFr24Yk/cDndWtT3O6agdSZ4=; b=mAHJn2d1iSQbRz9ef6wcE9io3Zzqmc6qnYrM4pcLLr3heIGqYDtskFAzpqtUzcGeglsCLl JAOjVu66I3eSSLTV7yDMQfXmz/RWsaLZr5LwuVvM7GUFi1Sl6Bavx6njwkpXxtcfovFin/ aUeERXpimnQlJRljxoYoOaTQc1tpekzZXKP/9Cd8J7Sx+uFXchxtOUITNA5gZ/X3UiBbIT iCtjA/ZUGManu+MHeAabMKtHVE1J+8H+xK65lrnuXlx+FEFZvHcjDOLWY1ANj+21Ru2Qho qAZIVzba+bXzT7ViV1Mb5UXHNnq7Xs5GgNTi64O57Kdn0NAzcUgj09BZFOnDew== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1647566023; a=rsa-sha256; cv=none; b=WnG4LwMp53woP+u2wbyWaPm0113usrBuEbDtZl3d6Dr0deq1gJwfCQmnRXyIglxgFMC/ia iAPToR8uYoe0QI3BCStQU6ImK4EoYaE23QqKw5P6GSIqQPql8lJ6sU9d3/2xcgZbDGND73 0OCci4y5+BU0TDS1lTdYTBRxFcmFob5APEtHOlNyoKEc23DcKo8EOiXEDzOUPe3l/nHwfO Oq/mr4Og+E9Cz2baL6s0fTGnSOSS2M3Qvr4LH7hpQN+MGm8klOARPVECYNhlPYEW8dUbV0 S0o6m1rTJIlEhgzcFc+2iIQXgri2LvcIaC8Y4ONMAI58Qw5y5UBQZGW6Xqm7SA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=cr2yhJGg; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.95 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=cr2yhJGg; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C9CB43BEA4 X-Spam-Score: -0.95 X-Migadu-Scanner: scn0.migadu.com X-TUID: KzP7G3EfWSZK --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * gnu/packages/genimage.scm (genimage): Update to 15. [arguments]: Update 'fix-failing-tests phase to reference new files. =2D-- gnu/packages/genimage.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index eb50141374..4a9d24fe78 100644 =2D-- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -41,11 +41,11 @@ (define-module (gnu packages genimage) #:use-module (gnu packages virtualization)) =20 (define-public genimage =2D (let ((commit "11bb04455eaf5434f0723c91a2224918ebd0a196") + (let ((commit "ec44ae086c705e6f0439e742c5a2e9b8f3d6ca82") (revision "1")) (package (name "genimage") =2D (version (git-version "14" revision commit)) + (version (git-version "15" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -54,7 +54,7 @@ (define-public genimage (file-name (git-file-name name version)) (sha256 (base32 =2D "1dq3lk0awk12v2aidry35gvrci5a3nr6rzcq0j9hyyf0w1z1rn0l"= )) + "0amj2vjff58yna6kq959i2gqmbjywqr8j5kr5pjqsvbqam3vgg0r")) (patches (search-patches "genimage-mke2fs-test.patch")))) (build-system gnu-build-system) @@ -93,9 +93,13 @@ (define-public genimage ;; We don't have /etc/passwd so uid 0 is not known as "root= ". ;; Thus patch it out. (substitute* '("test/ext2test.0.dump" + "test/ext2test.1.dump" "test/ext3test.0.dump" + "test/ext3test.1.dump" "test/ext4test.0.dump" + "test/ext4test.1.dump" "test/ext2test-percent.0.dump" + "test/ext2test-percent.1.dump" "test/mke2fs.0.dump") (("root") "unknown")))) (add-before 'check 'setenv-check =2D-=20 2.35.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCYjPckAAKCRDcUY/If5cW qlY8APsFDwwvyPXXkpcA0K8n1Q79nzYQVE8uzBrWeDthrbwTyQD/a2FNEQUKp8kX fKs+7tMwp6RSUqGoB5U36/8Oq9oAbQs= =/W7J -----END PGP SIGNATURE----- --=-=-=--