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 0445913933E for ; Tue, 6 Jul 2021 00:25:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25F00E0AB0; Tue, 6 Jul 2021 00:25:19 +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 D7370E0AB0 for ; Tue, 6 Jul 2021 00:25:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0C90833BE68 for ; Tue, 6 Jul 2021 00:25:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6352A7C7 for ; Tue, 6 Jul 2021 00:25:15 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1625528451.e7f7d6a7126ecec0bc7a62dd45cb140fa1e8684e.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: e7f7d6a7126ecec0bc7a62dd45cb140fa1e8684e X-VCS-Branch: master Date: Tue, 6 Jul 2021 00:25:15 +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: 0ae3e7b8-000a-4045-b62b-ab4010001ca6 X-Archives-Hash: 0970fd4fee655b32edac46fdbd716f26 commit: e7f7d6a7126ecec0bc7a62dd45cb140fa1e8684e Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Jul 5 22:19:47 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Jul 5 23:40:51 2021 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e7f7d6a7 gen_initramfs.sh: append_modules(): Export KEXT variable This will allow us to call modules_kext() just once. Signed-off-by: Thomas Deutschmann gentoo.org> gen_initramfs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index b826f17..52c5cb8 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -1759,18 +1759,18 @@ append_modules() { print_info 2 "$(get_indent 2)modules: >> Copying modules from '${modules_srcdir}' to initramfs ..." local i= mymod= - local MOD_EXT="$(modules_kext)" + local -x KEXT="$(modules_kext)" local n_copied_modules=0 for i in $(gen_dep_list) do - mymod=$(find . -name "${i}${MOD_EXT}" 2>/dev/null | head -n 1) + mymod=$(find . -name "${i}${KEXT}" 2>/dev/null | head -n 1) if [ -z "${mymod}" ] then - print_warning 3 "$(get_indent 3) - ${i}${MOD_EXT} not found; Skipping ..." + print_warning 3 "$(get_indent 3) - ${i}${KEXT} not found; Skipping ..." continue; fi - print_info 3 "$(get_indent 3) - Copying ${i}${MOD_EXT} ..." + print_info 3 "$(get_indent 3) - Copying ${i}${KEXT} ..." cp -ax --parents --target-directory "${modules_dstdir}" "${mymod}" 2>/dev/null \ || gen_die "Failed to copy '${modules_srcdir}/${mymod}' to '${modules_dstdir}'!" n_copied_modules=$[$n_copied_modules+1]