aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/linux.scm
diff options
context:
space:
mode:
authorDavid Craven <david@craven.ch>2016-09-26 12:10:21 +0200
committerDavid Craven <david@craven.ch>2016-09-28 12:40:12 +0200
commite4e9c0a083962a770ff4f56c69082cf4b7046a6c (patch)
tree598a1e8b537200930582b21a850cd38d4a768e7d /gnu/packages/linux.scm
parent50dbc03647170fded9e0bca0cc4b7e1614aa38db (diff)
downloadpatches-e4e9c0a083962a770ff4f56c69082cf4b7046a6c.tar
patches-e4e9c0a083962a770ff4f56c69082cf4b7046a6c.tar.gz
gnu: make-linux-libre: Install device tree files.
* gnu/packages/linux.scm (make-linux-libre): Install device tree files.
Diffstat (limited to 'gnu/packages/linux.scm')
-rw-r--r--gnu/packages/linux.scm19
1 files changed, 11 insertions, 8 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 0891c7401e..0a8e2f347d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -263,8 +263,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
(let ((build (assoc-ref %standard-phases 'build))
(config (assoc-ref inputs "kconfig")))
- ;; Use the architecture-specific config if available, and
- ;; 'defconfig' otherwise.
+ ;; Use a custom kernel configuration file or a default
+ ;; configuration file.
(if config
(begin
(copy-file config ".config")
@@ -283,13 +283,16 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
(lambda* (#:key inputs native-inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(moddir (string-append out "/lib/modules"))
- (kmod (assoc-ref (or native-inputs inputs) "kmod")))
+ (dtbdir (string-append out "/lib/dtbs"))
+ (kmod (assoc-ref (or native-inputs inputs) "kmod")))
+ ;; Install kernel image, kernel configuration and link map.
+ (for-each (lambda (file) (install-file file out))
+ (find-files "." "^(\\.config|bzImage|zImage|vmlinuz|System\\.map)$"))
+ ;; Install device tree files
+ (for-each (lambda (file) (install-file file dtbdir))
+ (find-files "." "\\.dtb$"))
+ ;; Install kernel modules
(mkdir-p moddir)
- (for-each (lambda (file)
- (copy-file file
- (string-append out "/" (basename file))))
- (find-files "." "^(bzImage|zImage|vmlinuz|System\\.map)$"))
- (copy-file ".config" (string-append out "/config"))
(zero? (system* "make"
(string-append "DEPMOD=" kmod "/bin/depmod")
(string-append "MODULE_DIR=" moddir)