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

gnu: linux: customize-linux: Remove input labels.

Browse source 
* gnu/packages/linux.scm (make-linux-libre-source) [native-inputs]: Delete
field, using the defconfig gexp directly...
[phases] <configure>: ... here.
This commit is contained in:
Maxim Cournoyer 2022-12-07 08:57:37 -05:00
parent 1e05b4a7fd
commit 234190df00
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/linux.scm
View file

@ -262,10 +262,10 @@ (define* (customize-linux #:key name
#$(and extra-version
(not (string-null? extra-version))
(string-append "-" extra-version)))
(let* ((configs
(string-append "arch/" #$(linux-srcarch) "/configs/"))
(guix_defconfig
(string-append configs "guix_defconfig")))
(let* ((configs (string-append "arch/" #$(linux-srcarch)
"/configs/"))
(guix_defconfig (string-append configs
"guix_defconfig")))
#$(cond
((not defconfig)
#~(begin
@ -282,19 +282,11 @@ (define* (customize-linux #:key name
guix_defconfig))
(else
;; Copy the defconfig input to the proper location.
#~(copy-file (assoc-ref inputs "guix_defconfig")
guix_defconfig)))
#~(copy-file #$defconfig guix_defconfig)))
(chmod guix_defconfig #o644)
(modify-defconfig guix_defconfig '#$configs)
(invoke "make" "guix_defconfig")
(verify-config ".config" guix_defconfig))))))))
(native-inputs
(append (if (or (not defconfig)
(string? defconfig))
'()
;; The defconfig should be an origin or file-like object.
`(("guix_defconfig" ,defconfig)))
(package-native-inputs linux)))))
(verify-config ".config" guix_defconfig))))))))))
(define (make-defconfig uri sha256-as-base32)
(origin (method url-fetch)