lfam pushed a commit to branch kernel-updates
in repository guix.

commit 85c46885f5e42b55203e70d18a12975b42dbe45e
Author: Leo Famulari <[email protected]>
AuthorDate: Tue Jan 21 12:14:34 2025 -0500

    Skip device tree conditionally
    
    Change-Id: I828c82a9a979fec2d693b2768ac8599021c81754
---
 gnu/packages/linux.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4a0ad156f5..67463e6c96 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1078,12 +1078,15 @@ ARCH and optionally VARIANT, or #f if there is no such 
configuration."
                 (for-each (lambda (file) (install-file file #$output))
                           (find-files "." "^(\\.config|bzImage|zImage|Image\
 |vmlinuz|System\\.map|Module\\.symvers)$"))
-                ;; Install device tree files
-;                (unless (null? (find-files "." "\\.dtb$"))
-;                  (mkdir-p dtbdir)
-;                  (apply invoke "make"
-;                         (string-append "INSTALL_DTBS_PATH=" dtbdir)
-;                         "dtbs_install" make-flags))
+                ;; Install device tree files on systems that support them
+                (match (%current-target-system)
+                         ((or "armhf-linux" "aarch64-linux")
+                          (unless (null? (find-files "." "\\.dtb$"))
+                            (mkdir-p dtbdir)
+                            (apply invoke "make"
+                                   (string-append "INSTALL_DTBS_PATH=" dtbdir)
+                                   "dtbs_install" make-flags)))
+                         (_ '()))
                 ;; Install kernel modules
                 (mkdir-p moddir)
                 (apply invoke "make"

Reply via email to