From patchwork Tue Sep 10 18:04:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 67857 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 980EA27BBEA; Tue, 10 Sep 2024 19:05:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7F43127BBE2 for ; Tue, 10 Sep 2024 19:05:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1so5Ea-0001ND-QN; Tue, 10 Sep 2024 14:05:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1so5EX-0001Fs-JH for guix-patches@gnu.org; Tue, 10 Sep 2024 14:04:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1so5EX-0007I9-7v for guix-patches@gnu.org; Tue, 10 Sep 2024 14:04:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=nOZgANMoYgwlWiXyYvZr426xC6J1AVdGYg1Ljdyx9KM=; b=Huxij2ca6T4DddANuRVhEVaGKX6RKJwLGSQiYw5OkQ4wWeE0UnvM0OoBzn+WyGQHQorRxv+7GeUn9PxqNgqMzvBHv5ROAOQrx5nPGiObHdi95XnzEqILCcPXtCIQkYVqwxyTEZ71M+G2l94QBLMWMYe2b0BXyY9ZGpyuX493boPVkAOB9KUTcnnTkgJiTzo0iMGMbWS/1YDy0wBV9iDLN7nZiikeE9oNJp94L7nqS5spXH5RzOMuWNqufp54uus+ngr16MsS0dihts77cObS8imoNIyo6wVqA6tJDAJHrLS03gaNgINZU3mnsNAP9RYqv+sv4Xgs8zZeGFnMc+DoUw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1so5Ec-0001mX-3q for guix-patches@gnu.org; Tue, 10 Sep 2024 14:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72982] [PATCH v2] gnu: genimage: Update to version 18. References: <20240902175649.3422-1-herman@rimm.ee> In-Reply-To: <20240902175649.3422-1-herman@rimm.ee> Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 18:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72982 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72982@debbugs.gnu.org Received: via spool by 72982-submit@debbugs.gnu.org id=B72982.17259915016837 (code B ref 72982); Tue, 10 Sep 2024 18:05:02 +0000 Received: (at 72982) by debbugs.gnu.org; 10 Sep 2024 18:05:01 +0000 Received: from localhost ([127.0.0.1]:36995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1so5Eb-0001mD-0n for submit@debbugs.gnu.org; Tue, 10 Sep 2024 14:05:01 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59177 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1so5EY-0001lo-72 for 72982@debbugs.gnu.org; Tue, 10 Sep 2024 14:04:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1725991485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=nOZgANMoYgwlWiXyYvZr426xC6J1AVdGYg1Ljdyx9KM=; b=swqTECS/N2A5j5w4ETmpwcJHUDvo2MbMmJ04K5z+MZzwh0cjZdqmDs30GSWxKGoyUa9RlE 7M5qUvZUKhTJ4kEiE5eOO4/2yD3VVI2WnbQ74q9ZXrR/GfpvbA/TrXY2adaD5Xq62PA5QS b7fKrkUzPWqUXz8IWKPLxbdjH0a6bYGANvwKSQlJcLI+4fISy91G2/6KRrtR7ClzJ/rIi8 GvjPatjT2de10TmFznzapOhAo7pzuZXn4tkT/w94yY+5toOUOG/x/pdzT4c3/LEK/TCW5Y 5pHPAV3uc3TxQDOfXXJBwl77SY00KLppBqhYB9kFhN5e3B9H4mZ4sJtEhcGE8g== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 0f453d19 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <72982@debbugs.gnu.org>; Tue, 10 Sep 2024 18:04:44 +0000 (UTC) Date: Tue, 10 Sep 2024 20:04:14 +0200 Message-ID: <20240910180414.32509-1-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/genimage.scm (genimage): Update from 15 to 18. [arguments]: Disable some tests. --- gnu/packages/genimage.scm | 62 +++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index 13f3dd67b0..b90adffb67 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -41,27 +41,26 @@ (define-module (gnu packages genimage) #:use-module (gnu packages virtualization)) (define-public genimage - (let ((commit "ec44ae086c705e6f0439e742c5a2e9b8f3d6ca82") - (revision "1")) + (let ((commit "00009af6e29cfd46909bc8b4180147dda9f82ba8") + (revision "0")) (package (name "genimage") - (version (git-version "15" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pengutronix/genimage") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0amj2vjff58yna6kq959i2gqmbjywqr8j5kr5pjqsvbqam3vgg0r")) - (patches - (search-patches "genimage-mke2fs-test.patch")))) + (version (git-version "18" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pengutronix/genimage") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mijyq79cb0yj4jm9ln9smpddq1f6r8cnsa568qca0krcv0p3zag")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) - ,@%default-gnu-modules) + ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'guixify @@ -70,8 +69,8 @@ (define-public genimage ((input directory regexp) (substitute* "config.c" (((format #f "\\.def = \"(~a)\"" regexp) _ command) - (format #f ".def = \"~a/~a/~a\"" - (assoc-ref inputs input) directory command))))) + (string-append ".def = \"" (assoc-ref inputs input) + "/" directory "/" command "\""))))) '(("cpio" "bin" "cpio") ("coreutils" "bin" "dd") ("e2fsprogs" "sbin" "debugfs|e2fsck|mke2fs|tune2fs") @@ -81,26 +80,36 @@ (define-public genimage ;; mkcramfs is obsolete. ("dosfstools" "sbin" "mkdosfs") ("mtd-utils" "sbin" "mkfs.(jffs2|ubifs)|ubinize") + ("f2fs-tools" "sbin" "(mkfs|sload).f2fs") ("squashfs-tools" "bin" "mksquashfs") ("qemu" "bin" "qemu-img") + ;; rauc and fiptool are unsupported. ("tar" "bin" "tar") ("u-boot-tools" "bin" "mkimage"))) (substitute* "util.c" (("\"/bin/sh\"") (string-append "\"" (assoc-ref inputs "bash") "/bin/sh\""))))) + (add-before 'check 'disable-failing-tests + (lambda _ + ;; We don't have /etc/passwd so uid 0 is not known as "root". + ;; Thus patch it out. + (substitute* '("test/flash.test") + (("test_expect_success \"flash\"") + "test_expect_fail \"flash\"")) + (substitute* '("test/hdimage.test") + (("test_expect_success fdisk,sfdisk \"hdimage\"") + "test_expect_fail fdisk,sfdisk \"hdimage\"") + (("test_expect_success hexdump \"hdimage no-partition\"") + "test_expect_fail hexdump \"hdimage no-partition\"")))) (add-before 'check 'fix-failing-tests (lambda _ ;; 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") + (substitute* '("test/ext2test.2.dump" + "test/ext3test.2.dump" + "test/ext4test.2.dump" + "test/ext2test-percent.2.dump" + "test/mke2fs.2.dump") (("root") "unknown")))) (add-before 'check 'setenv-check (lambda _ @@ -127,6 +136,7 @@ (define-public genimage ("coreutils" ,coreutils) ; chmod, dd ("dosfstools" ,dosfstools) ("e2fsprogs" ,e2fsprogs) + ("f2fs-tools" ,f2fs-tools) ("genext2fs" ,genext2fs) ("libconfuse" ,libconfuse) ("mtd-utils" ,mtd-utils)