From patchwork Sat Apr 6 15:24:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 62780 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 1D8D027BBE2; Sat, 6 Apr 2024 16:25:29 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 95C1927BBE9 for ; Sat, 6 Apr 2024 16:25:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rt7uc-0005ng-Ph; Sat, 06 Apr 2024 11:24:58 -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 1rt7ua-0005kW-Hk for guix-patches@gnu.org; Sat, 06 Apr 2024 11:24:56 -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 1rt7ua-0007Ze-9n for guix-patches@gnu.org; Sat, 06 Apr 2024 11:24:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rt7ug-0003Ob-1f for guix-patches@gnu.org; Sat, 06 Apr 2024 11:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70240] [PATCH] gnu: uefitool: Add extra outputs, correct typo Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Apr 2024 15:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70240 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70240@debbugs.gnu.org Cc: Ian Eure X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171241709913031 (code B ref -1); Sat, 06 Apr 2024 15:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Apr 2024 15:24:59 +0000 Received: from localhost ([127.0.0.1]:40623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rt7ub-0003O5-OH for submit@debbugs.gnu.org; Sat, 06 Apr 2024 11:24:59 -0400 Received: from lists.gnu.org ([2001:470:142::17]:40634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rt7uW-0003N8-B9 for submit@debbugs.gnu.org; Sat, 06 Apr 2024 11:24:56 -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 1rt7uK-0005ht-1I for guix-patches@gnu.org; Sat, 06 Apr 2024 11:24:40 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rt7uH-0006zO-7R for guix-patches@gnu.org; Sat, 06 Apr 2024 11:24:39 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id F2DD25C007D; Sat, 6 Apr 2024 11:24:32 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 06 Apr 2024 11:24:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm1; t=1712417072; x=1712503472; bh=ORdW7rKOJk9nDsUZPf64Y Jil7lmj2rXdY1qdB3vbiFM=; b=d6kDWABAJW3ymwMht3W+HDc5RIye1G8I7IYDj QtN8r/YJm9A9DNvwCNMwTI70rwvzsoyG+UVMa2UFpjFK39xMM3Mu+EFDKz155PAL KpkRbq7gjYdBa/yawGy9MWXhhf7vFH0KZ5puMOerLcJdtM0RPJuZISVzrjLN6F78 eUksaQh9OwTqTOr6pRbpUdLTO4Kg3fDlehLi1OQp64XdrXdr8in2sRBD1r8bOWCJ U+MZQNxZaXMek9LAwax2jcE6VFx76fBRlsodoCsTFeAIBogFN6W9hTzCckFGX9+a Bjqb6D4uetXdL1YqYrYzVbyycuFdBfKZ1DkU22TEntTeUz2aQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1712417072; x=1712503472; bh=ORdW7rKOJk9nDsUZPf64YJil7lmj 2rXdY1qdB3vbiFM=; b=C8YTg0M4YkIWh3xeHXASVFaLs0uFlPl8d/W0wLVepJQF /hBPF2KtHkf9vS1cc9AZWRdfucdtiMczPtkM06/WBdm8cAgWzT7Vq5Kz7H3W/PlC WFq65fYQMz1db7HUNjHfANNpAIQ3u6YTJ1+akMsbbsAa9Seh9MvoTLzLreYtN8cM 0hXPJSlC6qhtX8pYleBBzPGbONa47PWK5ewZhaVR4KZ5TimaIH04iK6wI9gLppPy 7FRap2KSaOV1vYYT+NdFj2o8VSctDNPgn3+fRRrH43/DI/KvSmS/NYAnlR8AL83y vxDeSv4kLSfRJ635haQaPFsH29qtbm0/Nbe3FfE1Ag== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudegvddgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdht vheqnecuggftrfgrthhtvghrnhepffelteehgfeugeekteetuddufedvfeeuhfdtudffgf evueeutdejudetfedukeegnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrh hoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 Apr 2024 11:24:32 -0400 (EDT) From: Ian Eure Date: Sat, 6 Apr 2024 08:24:00 -0700 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.29; envelope-from=ian@retrospec.tv; helo=out5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_DNSWL_LOW=-0.7, 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/flashing-tools.scm (uefitool): Add UEFIPatch and UEFIReplace in addition to UEFITool; add outputs for them. Correct package description. Change-Id: I45ca03a71c463c91ab11e9dcd47971afc06724b7 --- gnu/packages/flashing-tools.scm | 46 ++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 12 deletions(-) base-commit: ab3731d255ff1ac8d6874bc0f68ad94f21f08e79 diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 83a4c3e3e7..3787e9d32a 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -493,29 +493,51 @@ (define-public uefitool (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/LongSoft/UEFITool") - (commit version))) + (url "https://github.com/LongSoft/UEFITool") + (commit version))) (sha256 (base32 "1n2hd2dysi5bv2iyq40phh1jxc48gdwzs414vfbxvcharcwapnja")) (file-name (git-file-name name version)))) (build-system gnu-build-system) + (outputs '("out" "uefipatch" "uefireplace")) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda _ - (invoke "qmake" "-makefile"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (install-file "UEFITool" (string-append (assoc-ref outputs "out") - "/bin"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (invoke "qmake" "-makefile"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "UEFITool" (string-append (assoc-ref outputs "out") + "/bin")))) + (add-after 'configure 'configure-extras + (lambda _ + (with-directory-excursion "UEFIPatch" + (invoke "qmake" "-makefile")) + (with-directory-excursion "UEFIReplace" + (invoke "qmake" "-makefile")))) + (add-after 'build 'build-extras + (lambda _ + (with-directory-excursion "UEFIPatch" + (invoke "make" "-j")) + (with-directory-excursion "UEFIReplace" + (invoke "make" "-j")))) + (add-after 'install 'install-extras + (lambda* (#:key outputs #:allow-other-keys) + (install-file "UEFIPatch/UEFIPatch" + (string-append (assoc-ref outputs "uefipatch") + "/bin")) + (install-file "UEFIReplace/UEFIReplace" + (string-append (assoc-ref outputs "uefireplace") + "/bin"))))))) (inputs (list qtbase-5)) (home-page "https://github.com/LongSoft/UEFITool/") (synopsis "UEFI image editor") (description "@code{uefitool} is a graphical image file editor for -Unifinished Extensible Firmware Interface (UEFI) images.") +Unified Extensible Firmware Interface (UEFI) images.") (license license:bsd-2))) (define-public srecord