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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 129FA158004 for ; Mon, 20 May 2024 12:59:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89F17E2A3E; Mon, 20 May 2024 12:59:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57FA1E2A3F for ; Mon, 20 May 2024 12:59:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B17933BEE8 for ; Mon, 20 May 2024 12:59:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D114211CA for ; Mon, 20 May 2024 12:59:12 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1716209936.64150d2b2993dfc1c6c26bf374e687bfa8f0d686.bkohler@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_moddeps.sh X-VCS-Directories: / X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 64150d2b2993dfc1c6c26bf374e687bfa8f0d686 X-VCS-Branch: master Date: Mon, 20 May 2024 12:59:12 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2f1c3032-0ebc-4c5a-b0aa-ec5fb16630f4 X-Archives-Hash: 02c27d256db7b5d349d06abc4a45868b commit: 64150d2b2993dfc1c6c26bf374e687bfa8f0d686 Author: Maciej S. Szmigiero maciej szmigiero name> AuthorDate: Tue Mar 5 14:24:09 2024 +0000 Commit: Ben Kohler gentoo org> CommitDate: Mon May 20 12:58:56 2024 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=64150d2b gen_moddeps.sh: always include firmware for built-in modules with ALLFIRMWARE="no" These do not occur in the "modules.dep" file so they won't be caught by the dependency scanning loop in gen_dep_list() - they need to be manually added to the module list. Closes: #54 Signed-off-by: Maciej S. Szmigiero maciej.szmigiero.name> Signed-off-by: Ben Kohler gentoo.org> gen_moddeps.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gen_moddeps.sh b/gen_moddeps.sh index 070131c..7e2e070 100755 --- a/gen_moddeps.sh +++ b/gen_moddeps.sh @@ -62,14 +62,13 @@ gen_dep_list() { rxargs=( "${rxargs[@]/#/-e\/}" ) rxargs=( "${rxargs[@]/%/${KEXT}:}" ) - cat "${moddir}/modules.builtin" \ - | xargs printf '%s:\n' \ - | grep -F "${rxargs[@]}" - cat "${moddir}/modules.dep" \ | grep -F "${rxargs[@]}" ) + # Always include firmware for built-in modules + cat "${moddir}/modules.builtin" + printf '%s\n' "${moddeplist[@]}" fi | xbasename | sort | uniq }