From patchwork Mon Sep 26 10:34:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Craven X-Patchwork-Id: 16013 Received: (qmail 53193 invoked by uid 89); 26 Sep 2016 10:35:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=ARCH, H*r:Unknown, dtb X-Spam-Status: No, score=-4.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 26 Sep 2016 10:35:25 +0000 Received: from localhost ([::1]:43150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boTFr-0001zy-G4 for patchwork@sourceware.org; Mon, 26 Sep 2016 06:35:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boTFd-0001wN-55 for guix-devel@gnu.org; Mon, 26 Sep 2016 06:35:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1boTFZ-0004Kd-Mp for guix-devel@gnu.org; Mon, 26 Sep 2016 06:35:08 -0400 Received: from so254-10.mailgun.net ([198.61.254.10]:33036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boTFY-0004Et-Go for guix-devel@gnu.org; Mon, 26 Sep 2016 06:35:05 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=craven.ch; q=dns/txt; s=mx; t=1474886103; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=1J5e8b1cA9zsuiPalsBXdN966vugA+WfChbSCWvwj3c=; b=kq2Hmia1XlOopoOSXvQgBkk2p99Jm8FNswOihm3YDrwILTuR+1SULnwIlL+XrUIJHCSaWoLv XF/FA0PUMM0Lg+hyJ9RcLcv7R8KcMyitdFEIrLupkLqmeg/5gOJMwSpeKklET1q1b4Do5HFH LZszGevv1b05t69Ilyw8KqIMaTM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=craven.ch; s=mx; q=dns; h=Sender: From: To: Cc: Subject: Date: Message-Id: In-Reply-To: References; b=Xb21R/aSL+YzQotjwQxMMOUflschAMwXL39kvBukfgPTQAzsxDuekzZgk+EOoVl+wMz8Q/ AFbkM/a5W2LHSrfyysjcFMe5vz7CTkH2SmlSr26Ld/XQ+4+P8wwpPsARqWs1UX9dJy7M2LAX iUv5J8pln/pxGsnAC3BJ8m02zj4X4= X-Mailgun-Sending-Ip: 198.61.254.10 X-Mailgun-Sid: WyIxMzZlMCIsICJndWl4LWRldmVsQGdudS5vcmciLCAiMDFiMjAiXQ== Received: from xps.campus.intern (Unknown [147.88.200.113]) by mxa.mailgun.org with ESMTP id 57e8f9d6.7f86586c8b58-in06; Mon, 26 Sep 2016 10:35:02 -0000 (UTC) From: David Craven To: guix-devel@gnu.org Subject: [PATCH 3/6] gnu: make-linux-libre: Install device tree files. Date: Mon, 26 Sep 2016 12:34:44 +0200 Message-Id: <20160926103447.31830-3-david@craven.ch> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160926103447.31830-1-david@craven.ch> References: <20160926103447.31830-1-david@craven.ch> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 198.61.254.10 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" * gnu/packages/linux.scm (make-linux-libre): Install device tree files. --- gnu/packages/linux.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d8d14d4..243a71c 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)