From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 8BNiMMH81WYVGAEAqHPOHw:P1 (envelope-from ) for ; Mon, 02 Sep 2024 17:58:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 8BNiMMH81WYVGAEAqHPOHw (envelope-from ) for ; Mon, 02 Sep 2024 19:58:25 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=VWEkbDlE; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=Up+DheRU; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725299905; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: 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=p/fs3R1KaOonZHAwjxwMUfdtgVjy7w+hJwaDTj0SPVU=; b=AWKKMZjChkh1UEeCovgzHu4p31+/QPNClxv3cnYPZ1I/GiW2n/6vj77uGQ6HF8p1mrePAD ebRj2g+RrN6VLqrVf3nZhXR7qbGCxZc21KXssogYD1/fA94EkMWRQxxUvFVtjOmfrkWlQH PYN7dsDHY0y6rqD78UEKudBfRR68D95BKpwfmpb7ZWRSFB8P3goXVrLfBYeSVWrGDu7gLz NDiHqLgAKjDhX68PLbXtY7T0xoh09v6ocbicChcm4q2BO0z0FhK284QNzDGtR9GeuFcwJ6 FjVSC1NaYjgE1y5Rs7lBkJ2YachDzIBkWytwZEdiU1i9UneFM2IXOvkTZxwiAw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725299905; a=rsa-sha256; cv=none; b=e8sY1qVhlp+ooUKrHOvx8/Q7cEfTdYdZYGB4VOovWXFQj2jRL6Ez3JYNSpIeCuZoSY+Hbr u8UQLX0U0jyiDqnLAGIuxf7z49oOysO7y/dpKb0eB4DntLRXYLwDwGSQri9/y8QUN64Ihk GH75jULSF20L3XDZ6FxCzDTA8xEHUMQ3Zw4Kt893mXSaI7406Cu3LiHljfgy+ShVMJiy7I aR4X5z8NGuVLafY7MUlZUiK6SUWPr3yjLO68W/xT2slqjDmeiAoXBBcDniwlDkk2qRF8R0 KlGMpp4Gn4ru6qEuv0KFc13ka//CeEWg0/+ORk77Tf7zvrhclAOHlG7uMeqnXA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=VWEkbDlE; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=Up+DheRU; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 787D66E0D8 for ; Mon, 2 Sep 2024 19:58:25 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1slBJT-0000wM-PR; Mon, 02 Sep 2024 13:58:03 -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 1slBJS-0000w8-Ai for guix-patches@gnu.org; Mon, 02 Sep 2024 13:58:02 -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 1slBJS-0002HS-08 for guix-patches@gnu.org; Mon, 02 Sep 2024 13:58:02 -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:Subject; bh=p/fs3R1KaOonZHAwjxwMUfdtgVjy7w+hJwaDTj0SPVU=; b=VWEkbDlEABNZhZ21UGYLdVccmFgpyy+8hbLy1xmokPqCWfjNSfATa5ix5RgZqVcrJucYvAnD5YdzDG1drgu6cOTpBjbhUpkyHDKTCEl3ohWjLQVUqvbdiHvLVnM/Neokt52V3pM5cwGbdQ4mAxJLbPuYtOvjH0DXFhWAR2R2c3bi40piAFV/i2CFW08g5tADX8RauC1YH5hZrN3/p6BT/6FfLSCZxxVytW+dyEo+bHzafVhkR8gZetDXn59ATIeACU80mrf0HvMZ5XZDIxhCnZhueisMshVuDRZPCeEoUfanzJvnMqL9zsY2q4PZ3Ar9mayOkTMuCpxIeNRT61RoyA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1slBKQ-0007ZA-Bs for guix-patches@gnu.org; Mon, 02 Sep 2024 13:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72982] [PATCH] gnu: genimage: Update to version 18. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2024 17:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72982 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72982@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172529991529034 (code B ref -1); Mon, 02 Sep 2024 17:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2024 17:58:35 +0000 Received: from localhost ([127.0.0.1]:50261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slBJy-0007YD-AH for submit@debbugs.gnu.org; Mon, 02 Sep 2024 13:58:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:36962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slBJu-0007Y2-N6 for submit@debbugs.gnu.org; Mon, 02 Sep 2024 13:58:32 -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 1slBIv-0000uS-0z for guix-patches@gnu.org; Mon, 02 Sep 2024 13:57:29 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1slBIs-0002Fp-RX for guix-patches@gnu.org; Mon, 02 Sep 2024 13:57:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1725299840; 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=p/fs3R1KaOonZHAwjxwMUfdtgVjy7w+hJwaDTj0SPVU=; b=Up+DheRUh96Gj5uVTtPNfca1kqyIjtof6d6ibHXXkkJGO2XGIAepJ/TYA1YSrKLROwj+J+ cUqnmpVro9hB/PWuKc186qS6WQxeQ99V11uAVejgEJ8bPNHf/jsV82maqpI5KTs7JIUj2E 0y1JAmCEB4n1rsg3AFJH7qQHW71Njs2I2gY+8PBzXb9KQT1K7gEBajQLlABzVXv6T6Zahc Dm7nAJVJtXg4IwU7zU5ejjGXWGb9NSht1ycsufAAba2yj+2gZb0yKdAA0gSLPHjxtR2mkj 7MV0UWdkmGjm29MjBk4/E9Kr+i75djN32jX9IIYiwCibAwBBoD/55uF+dsUK2A== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id b9bc38bf (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Mon, 2 Sep 2024 17:57:20 +0000 (UTC) Date: Mon, 2 Sep 2024 19:56:49 +0200 Message-ID: <20240902175649.3422-1-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_PBL=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 787D66E0D8 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.68 X-Spam-Score: -6.68 X-TUID: tvMzksRm/PYm * gnu/packages/genimage.scm (genimage): Update from 15 to 18. [source]: Fetch tarball instead of git commit. [arguments]: Disable some tests. --- gnu/packages/genimage.scm | 205 ++++++++++++++++++++------------------ 1 file changed, 106 insertions(+), 99 deletions(-) diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index 13f3dd67b0..7df61724ec 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -19,9 +19,9 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages genimage) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix packages) - #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) #:use-module (guix build utils) @@ -41,102 +41,109 @@ (define-module (gnu packages genimage) #:use-module (gnu packages virtualization)) (define-public genimage - (let ((commit "ec44ae086c705e6f0439e742c5a2e9b8f3d6ca82") - (revision "1")) - (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")))) - (build-system gnu-build-system) - (arguments - `(#:modules - ((ice-9 match) - ,@%default-gnu-modules) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'guixify - (lambda* (#:key inputs #:allow-other-keys) - (map (match-lambda - ((input directory regexp) - (substitute* "config.c" - (((format #f "\\.def = \"(~a)\"" regexp) _ command) - (format #f ".def = \"~a/~a/~a\"" - (assoc-ref inputs input) directory command))))) - '(("cpio" "bin" "cpio") - ("coreutils" "bin" "dd") - ("e2fsprogs" "sbin" "debugfs|e2fsck|mke2fs|tune2fs") - ("genext2fs" "bin" "genext2fs") - ("cdrkit-libre" "bin" "genisoimage") - ("mtools" "bin" "mcopy|mmd") - ;; mkcramfs is obsolete. - ("dosfstools" "sbin" "mkdosfs") - ("mtd-utils" "sbin" "mkfs.(jffs2|ubifs)|ubinize") - ("squashfs-tools" "bin" "mksquashfs") - ("qemu" "bin" "qemu-img") - ("tar" "bin" "tar") - ("u-boot-tools" "bin" "mkimage"))) - (substitute* "util.c" - (("\"/bin/sh\"") - (string-append "\"" (assoc-ref inputs "bash") "/bin/sh\""))))) - (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") - (("root") "unknown")))) - (add-before 'check 'setenv-check - (lambda _ - ;; Our container doesn't provide access to /etc/mtab - (setenv "EXT2FS_NO_MTAB_OK" "1") - ;; Make test reproducible - (setenv "GENIMAGE_MKFJFFS2" "mkfs.jffs2 -U") - (setenv "GENIMAGE_MKE2FS" "mke2fs -E no_copy_xattrs"))) - (replace 'check - (lambda _ - (invoke "make" "TEST_LOG_COMPILER=" "check")))))) - (native-inputs - (list autoconf - automake - ;;; Note: cramfs is obsolete. - dtc ; for the tests - pkg-config - util-linux)) ; for the tests - (inputs - `(("bash" ,bash) - ("cdrkit-libre" ,cdrkit-libre) - ("cpio" ,cpio) - ;; Note: invoked by final executable. - ("coreutils" ,coreutils) ; chmod, dd - ("dosfstools" ,dosfstools) - ("e2fsprogs" ,e2fsprogs) - ("genext2fs" ,genext2fs) - ("libconfuse" ,libconfuse) - ("mtd-utils" ,mtd-utils) - ("mtools" ,mtools) - ("qemu" ,qemu-minimal) - ("squashfs-tools" ,squashfs-tools) - ("tar" ,tar) - ("u-boot-tools" ,u-boot-tools))) - (synopsis "Create Flash images according to specification") - (description "@command{genimage} creates Flash images according to a + (package + (name "genimage") + (version "18") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/pengutronix/genimage/" + "releases/download/v" version "/genimage-" + version ".tar.xz")) + (sha256 + (base32 + "1pgy2cp8mnlsz3i8q434h83p19p5k0p3qpkddkfn806qqj3gihzb")))) + (build-system gnu-build-system) + (arguments + `(#:modules + ((ice-9 match) + ,@%default-gnu-modules) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'guixify + (lambda* (#:key inputs #:allow-other-keys) + (map (match-lambda + ((input directory regexp) + (substitute* "config.c" + (((format #f "\\.def = \"(~a)\"" regexp) _ command) + (format #f ".def = \"~a/~a/~a\"" + (assoc-ref inputs input) directory command))))) + '(("cpio" "bin" "cpio") + ("coreutils" "bin" "dd") + ("e2fsprogs" "sbin" "debugfs|e2fsck|mke2fs|tune2fs") + ("genext2fs" "bin" "genext2fs") + ("cdrkit-libre" "bin" "genisoimage") + ("mtools" "bin" "mcopy|mmd") + ;; 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.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 _ + ;; Our container doesn't provide access to /etc/mtab + (setenv "EXT2FS_NO_MTAB_OK" "1") + ;; Make test reproducible + (setenv "GENIMAGE_MKFJFFS2" "mkfs.jffs2 -U") + (setenv "GENIMAGE_MKE2FS" "mke2fs -E no_copy_xattrs"))) + (replace 'check + (lambda _ + (invoke "make" "TEST_LOG_COMPILER=" "check")))))) + (native-inputs + (list autoconf + automake + ;;; Note: cramfs is obsolete. + dtc ; for the tests + pkg-config + util-linux)) ; for the tests + (inputs + `(("bash" ,bash) + ("cdrkit-libre" ,cdrkit-libre) + ("cpio" ,cpio) + ;; Note: invoked by final executable. + ("coreutils" ,coreutils) ; chmod, dd + ("dosfstools" ,dosfstools) + ("e2fsprogs" ,e2fsprogs) + ("f2fs-tools" ,f2fs-tools) + ("genext2fs" ,genext2fs) + ("libconfuse" ,libconfuse) + ("mtd-utils" ,mtd-utils) + ("mtools" ,mtools) + ("qemu" ,qemu-minimal) + ("squashfs-tools" ,squashfs-tools) + ("tar" ,tar) + ("u-boot-tools" ,u-boot-tools))) + (synopsis "Create Flash images according to specification") + (description "@command{genimage} creates Flash images according to a specification file.") - (home-page "https://github.com/pengutronix/genimage") - (license license:gpl2)))) + (home-page "https://github.com/pengutronix/genimage") + (license license:gpl2))) -- 2.45.2