branch master updated: gnu: linux-libre: Correct name of EXTRAVERSION, and prepend "-" to content.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

dannym pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new b04cba9  gnu: linux-libre: Correct name of EXTRAVERSION, and prepend 
"-" to content.
b04cba9 is described below

commit b04cba9ee533945f90ffd72637f064c60188f945
Author: Stefan <stefan-guix@vodafonemail.de>
AuthorDate: Sat Jun 19 20:03:11 2021 +0200

    gnu: linux-libre: Correct name of EXTRAVERSION, and prepend "-" to content.
    
    * gnu/packages/linux.scm (make-linux-libre): Move the comment for the
    configuration-file argument to the correct position.
    (make-linux-libre*): Move the comment for the configuration-file argument
    to the correct position.
    Fix name of environment variable EXTRAVERSION.
    Prepend a hyphen to the content of EXTRAVERSION.
    
    Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 gnu/packages/linux.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 699a01e..904338d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -727,9 +727,9 @@ for ARCH and optionally VARIANT, or #f if there is no such 
configuration."
 
 (define* (make-linux-libre version hash-string supported-systems
                            #:key
+                           (extra-version #f)
                            ;; A function that takes an arch and a variant.
                            ;; See kernel-config for an example.
-                           (extra-version #f)
                            (configuration-file #f)
                            (defconfig "defconfig")
                            (extra-options %default-extra-linux-options)
@@ -748,9 +748,9 @@ for ARCH and optionally VARIANT, or #f if there is no such 
configuration."
 
 (define* (make-linux-libre* version source supported-systems
                             #:key
+                            (extra-version #f)
                             ;; A function that takes an arch and a variant.
                             ;; See kernel-config for an example.
-                            (extra-version #f)
                             (configuration-file #f)
                             (defconfig "defconfig")
                             (extra-options %default-extra-linux-options))
@@ -816,7 +816,8 @@ for ARCH and optionally VARIANT, or #f if there is no such 
configuration."
                  (format #t "`CROSS_COMPILE' set to `~a'~%"
                          (getenv "CROSS_COMPILE"))))
 
-             (setenv "EXTRA_VERSION" ,extra-version)
+             (setenv "EXTRAVERSION" ,(and extra-version
+                                          (string-append "-" extra-version)))
 
              (let ((build  (assoc-ref %standard-phases 'build))
                    (config (assoc-ref (or native-inputs inputs) "kconfig")))