TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* 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>
This commit is contained in:
Stefan 2021-06-19 20:03:11 +02:00 committed by Danny Milosavljevic
parent c7b2bbc3de
commit b04cba9ee5
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/linux.scm
View file

@ -727,9 +727,9 @@ (define (config->string options)
(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 @@ (define* (make-linux-libre version hash-string supported-systems
(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 @@ (define* (make-linux-libre* version source supported-systems
(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")))