ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 #$(and extra-version
(not (string-null? extra-version)) (not (string-null? extra-version))
(string-append "-" extra-version))) (string-append "-" extra-version)))
(let* ((configs (let* ((configs (string-append "arch/" #$(linux-srcarch)
(string-append "arch/" #$(linux-srcarch) "/configs/")) "/configs/"))
(guix_defconfig (guix_defconfig (string-append configs
(string-append configs "guix_defconfig"))) "guix_defconfig")))
#$(cond #$(cond
((not defconfig) ((not defconfig)
#~(begin #~(begin
@ -282,19 +282,11 @@ (define* (customize-linux #:key name
guix_defconfig)) guix_defconfig))
(else (else
;; Copy the defconfig input to the proper location. ;; Copy the defconfig input to the proper location.
#~(copy-file (assoc-ref inputs "guix_defconfig") #~(copy-file #$defconfig guix_defconfig)))
guix_defconfig)))
(chmod guix_defconfig #o644) (chmod guix_defconfig #o644)
(modify-defconfig guix_defconfig '#$configs) (modify-defconfig guix_defconfig '#$configs)
(invoke "make" "guix_defconfig") (invoke "make" "guix_defconfig")
(verify-config ".config" 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)))))
(define (make-defconfig uri sha256-as-base32) (define (make-defconfig uri sha256-as-base32)
(origin (method url-fetch) (origin (method url-fetch)