guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: guix-commits
Subject: 02/02: gnu: linux: customize-linux: Remove input labels.
Date: Wed, 7 Dec 2022 09:27:12 -0500 (EST)

apteryx pushed a commit to branch master
in repository guix.

commit 234190df00ae8032db38c7a4e2c82d7d8f364990
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Dec 7 08:57:37 2022 -0500

    gnu: linux: customize-linux: Remove input labels.
    
    * gnu/packages/linux.scm (make-linux-libre-source) [native-inputs]: Delete
    field, using the defconfig gexp directly...
    [phases] <configure>: ... here.
---
 gnu/packages/linux.scm | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8d86ec67e1..5ae9d82530 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -262,10 +262,10 @@ of 'uname -r' behind the Linux version numbers."
                         #$(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 @@ of 'uname -r' behind the Linux version numbers."
                                      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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]