1 |
commit: e7f7d6a7126ecec0bc7a62dd45cb140fa1e8684e |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 5 22:19:47 2021 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 5 23:40:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e7f7d6a7 |
7 |
|
8 |
gen_initramfs.sh: append_modules(): Export KEXT variable |
9 |
|
10 |
This will allow us to call modules_kext() just once. |
11 |
|
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
gen_initramfs.sh | 8 ++++---- |
15 |
1 file changed, 4 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/gen_initramfs.sh b/gen_initramfs.sh |
18 |
index b826f17..52c5cb8 100755 |
19 |
--- a/gen_initramfs.sh |
20 |
+++ b/gen_initramfs.sh |
21 |
@@ -1759,18 +1759,18 @@ append_modules() { |
22 |
print_info 2 "$(get_indent 2)modules: >> Copying modules from '${modules_srcdir}' to initramfs ..." |
23 |
|
24 |
local i= mymod= |
25 |
- local MOD_EXT="$(modules_kext)" |
26 |
+ local -x KEXT="$(modules_kext)" |
27 |
local n_copied_modules=0 |
28 |
for i in $(gen_dep_list) |
29 |
do |
30 |
- mymod=$(find . -name "${i}${MOD_EXT}" 2>/dev/null | head -n 1) |
31 |
+ mymod=$(find . -name "${i}${KEXT}" 2>/dev/null | head -n 1) |
32 |
if [ -z "${mymod}" ] |
33 |
then |
34 |
- print_warning 3 "$(get_indent 3) - ${i}${MOD_EXT} not found; Skipping ..." |
35 |
+ print_warning 3 "$(get_indent 3) - ${i}${KEXT} not found; Skipping ..." |
36 |
continue; |
37 |
fi |
38 |
|
39 |
- print_info 3 "$(get_indent 3) - Copying ${i}${MOD_EXT} ..." |
40 |
+ print_info 3 "$(get_indent 3) - Copying ${i}${KEXT} ..." |
41 |
cp -ax --parents --target-directory "${modules_dstdir}" "${mymod}" 2>/dev/null \ |
42 |
|| gen_die "Failed to copy '${modules_srcdir}/${mymod}' to '${modules_dstdir}'!" |
43 |
n_copied_modules=$[$n_copied_modules+1] |