unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Ian Eure <ian@retrospec.tv>
To: 70240@debbugs.gnu.org
Cc: Ian Eure <ian@retrospec.tv>
Subject: [bug#70240] [PATCH] gnu: uefitool: Add extra outputs, correct typo
Date: Sat,  6 Apr 2024 08:24:00 -0700	[thread overview]
Message-ID: <db7d802738f4de9e67fb5287769d5a702abeda6a.1712417040.git.ian@retrospec.tv> (raw)

* 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(-)

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

base-commit: ab3731d255ff1ac8d6874bc0f68ad94f21f08e79
-- 
2.41.0





             reply	other threads:[~2024-04-06 15:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-06 15:24 Ian Eure [this message]
2024-04-15  8:58 ` [bug#70240] [PATCH] gnu: uefitool: Add extra outputs, correct typo Christopher Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=db7d802738f4de9e67fb5287769d5a702abeda6a.1712417040.git.ian@retrospec.tv \
    --to=ian@retrospec.tv \
    --cc=70240@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).