From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5975B1382C5 for ; Sat, 14 Apr 2018 14:53:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CFF8E08CA; Sat, 14 Apr 2018 14:53:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5AEB0E08CA for ; Sat, 14 Apr 2018 14:53:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C3090335C36 for ; Sat, 14 Apr 2018 14:53:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D36B230 for ; Sat, 14 Apr 2018 14:53:06 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1523717577.4eea4b02f33038cbf8d0ea706dd212df964cac4a.blueness@gentoo> Subject: [gentoo-commits] proj/grss:master commit in: grs/ X-VCS-Repository: proj/grss X-VCS-Files: grs/Kernel.py X-VCS-Directories: grs/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 4eea4b02f33038cbf8d0ea706dd212df964cac4a X-VCS-Branch: master Date: Sat, 14 Apr 2018 14:53:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 071828d5-ab22-4aea-bc2c-d1ad4bb2984e X-Archives-Hash: 411efb057d58a61a9bbfcddc19d3f3d8 commit: 4eea4b02f33038cbf8d0ea706dd212df964cac4a Author: Anthony G. Basile gentoo org> AuthorDate: Sat Apr 14 14:52:57 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Apr 14 14:52:57 2018 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=4eea4b02 grs/Kernel.py: look for firmware-dir in portage_configroot grs/Kernel.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/grs/Kernel.py b/grs/Kernel.py index 7582e81..82e6d04 100644 --- a/grs/Kernel.py +++ b/grs/Kernel.py @@ -92,6 +92,10 @@ class Kernel(): boot_dir = os.path.join(image_dir, 'boot') modprobe_dir = os.path.join(image_dir, 'etc/modprobe.d') modules_dir = os.path.join(image_dir, 'lib/modules') + + # The firmware directory, if it exists, will be in self.portage_configroot + firmware_dir = os.path.join(self.portage_configroot, 'lib/firmware') + # Prepare tarball filename and path. If the tarball already exists, # don't rebuild/reinstall it. Note: It should have been installed to # the system's portage configroot when it was first built, so no need @@ -132,6 +136,8 @@ class Kernel(): cmd += '--busybox-config=%s ' % self.busybox_config if os.path.isfile(self.genkernel_config): cmd += '--config=%s ' % self.genkernel_config + if os.path.isdir(firmware_dir): + cmd += '--firmware-dir=%s ' % firmware_dir if has_modules: cmd += 'all' else: