GNU bug report logs - #63635
[PATCH 0/2] gnu: sbsigntools: Update to 0.9.5.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63635 in the body.
You can then email your comments to 63635 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Felix Lechner <felix.lechner <at> lease-up.com>
To: guix-patches <at> gnu.org
Cc: Felix Lechner <felix.lechner <at> lease-up.com>
Subject: [PATCH 0/2] gnu: sbsigntools: Update to 0.9.5,
Date: Sun, 21 May 2023 16:13:00 -0700

This patch series brings sbsigntools up the the latest coding standards.

Felix Lechner (2):
  gnu: sbsigntools: Convert to gexp, new-style inputs.
  gnu: sbsigntools: Update to 0.9.5.

 gnu/packages/efi.scm | 58 +++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 30 deletions(-)


base-commit: c5bc698e8922d78ed85989985cc2ceb034de2f23
-- 
2.40.1

Message #8 received at 63635 <at> debbugs.gnu.org (full text, mbox):

From: Felix Lechner <felix.lechner <at> lease-up.com>
To: 63635 <at> debbugs.gnu.org
Cc: Felix Lechner <felix.lechner <at> lease-up.com>
Subject: [PATCH 1/2] gnu: sbsigntools: Convert to gexp, new-style inputs.
Date: Sun, 21 May 2023 16:14:50 -0700

* gnu/packages/efi.scm (sbsigntools): Convert to gexp, new-style inputs.
---
 gnu/packages/efi.scm | 54 +++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm
index 75eb24bf86..b3da555549 100644
--- a/gnu/packages/efi.scm
+++ b/gnu/packages/efi.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages efi)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -113,31 +114,28 @@ (define-public sbsigntools
         (base32 "1y76wy65y6k10mjl2dm5hb5ms475alr4s080xzj8y833x01xvf3m"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-more-shebangs
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "lib/ccan.git/tools/create-ccan-tree"
-              (("#!/bin/bash")
-               (string-append "#!"
-                              (assoc-ref inputs "bash")
-                              "/bin/bash")))
-             #t))
-         (add-after 'unpack 'patch
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (substitute* '("configure.ac"
-                            "tests/Makefile.am")
-              (("/usr/include/efi")
-               (string-append (assoc-ref inputs "gnu-efi")
-                              "/include/efi"))
-              (("/usr/lib/gnuefi")
-               (string-append (assoc-ref inputs "gnu-efi")
-                              "/lib")))
-             #t))
-         (add-after 'unpack 'setenv
-           (lambda _
-             (setenv "CC" "gcc")
-             #t)))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-more-shebangs
+            (lambda _
+              (substitute* "lib/ccan.git/tools/create-ccan-tree"
+                (("#!/bin/bash")
+                 (string-append "#!" #$bash "/bin/bash")))
+              #t))
+          (add-after 'unpack 'patch
+            (lambda _
+              (substitute* '("configure.ac"
+                             "tests/Makefile.am")
+                (("/usr/include/efi")
+                 (string-append #$gnu-efi "/include/efi"))
+                (("/usr/lib/gnuefi")
+                 (string-append #$gnu-efi "/lib")))
+              #t))
+          (add-after 'unpack 'setenv
+            (lambda _
+              (setenv "CC" "gcc")
+              #t)))))
     (native-inputs
      (list autoconf
            automake
@@ -146,9 +144,9 @@ (define-public sbsigntools
            pkg-config
            util-linux)) ; getopt
     (inputs
-     `(("gnu-efi" ,gnu-efi)
-       ("libuuid" ,util-linux "lib")
-       ("openssl" ,openssl)))
+     (list gnu-efi
+           (list util-linux "lib")
+           openssl))
     (synopsis "EFI signing tools")
     (description "This package provides tools for signing EFI binaries.")
     (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/")
-- 
2.40.1

Message #11 received at 63635 <at> debbugs.gnu.org (full text, mbox):

From: Felix Lechner <felix.lechner <at> lease-up.com>
To: 63635 <at> debbugs.gnu.org
Cc: Felix Lechner <felix.lechner <at> lease-up.com>
Subject: [PATCH 2/2] gnu: sbsigntools: Update to 0.9.5.
Date: Sun, 21 May 2023 16:14:51 -0700

Will cause the rebuilding of a single package, namely efitools <at> 1.9.2.

The linter complains with this message:

  sbsigntools <at> 0.9.5: label 'util-linux' does not match package name
  'util-linux:lib'

* gnu/packages/efi.scm (sbsigntools): Update to 0.9.5.
---
 gnu/packages/efi.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm
index b3da555549..c897b8c57e 100644
--- a/gnu/packages/efi.scm
+++ b/gnu/packages/efi.scm
@@ -100,7 +100,7 @@ (define-public efi-analyzer
 (define-public sbsigntools
   (package
     (name "sbsigntools")
-    (version "0.9.4")
+    (version "0.9.5")
     (source
      (origin
        (method git-fetch)
@@ -111,7 +111,7 @@ (define-public sbsigntools
          (recursive? #t)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1y76wy65y6k10mjl2dm5hb5ms475alr4s080xzj8y833x01xvf3m"))))
+        (base32 "060n6w0dx1mrilhdv482ncckanqz6pdv53piimiki0bm15d2fcp4"))))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
2.40.1

Message #18 received at 63635 <at> debbugs.gnu.org (full text, mbox):

From: Felix Lechner <felix.lechner <at> lease-up.com>
To: 63635 <at> debbugs.gnu.org, 63793 <at> debbugs.gnu.org
Cc: kiasoc5 <at> disroot.org
Subject: Merged duplicate
Date: Wed, 31 May 2023 07:49:53 -0700

Hi,

There is a merged duplicate to this bug that may be hidden in Mumi.
The two bugs are Bug#63793 and Bug#63635. The linkage may be easier to
see in Debbugs.

Kind regards
Felix

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.