Skip to content

Commit 38bec2e

Browse files
committed
build: Fix shellcheck warning
Signed-off-by: Saalim Quadri <danascape@gmail.com>
1 parent d919b7d commit 38bec2e

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

src/build.sh

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,27 @@ check_kernel()
4848

4949
}
5050

51+
do_kernel_modules()
52+
{
53+
mkdir out/dist/modules
54+
modules=()
55+
56+
while IFS= read -r -d $'\0' file; do
57+
modules+=("$file")
58+
done < <(find out/modules/lib/modules/ -name '*.ko' -print0)
59+
60+
for file in "${modules[@]}"; do
61+
cp "$file" "$dist_path/modules/"
62+
done
63+
64+
# cp $(find out/modules/lib/modules/* -name '*.ko') $dist_path/modules/
65+
cp out/modules/lib/modules/*/modules.{alias,dep,softdep} "$dist_path"/modules
66+
cp out/modules/lib/modules/*/modules.order "$dist_path"/modules/modules.load
67+
sed -i 's/\(kernel\/[^: ]*\/\)\([^: ]*\.ko\)/\/vendor\/lib\/modules\/\2/g' "$dist_path"/modules/modules.dep
68+
sed -i 's/.*\///g' "$dist_path"/modules/modules.load
69+
70+
}
71+
5172
displayDeviceInfo()
5273
{
5374

@@ -198,12 +219,7 @@ kernel_build()
198219
cp "$kernel_image_path" $dist_path
199220
if [[ -n "$do_modules" ]]; then
200221
log_info "sworkflow: Copying modules"
201-
mkdir out/dist/modules
202-
cp $(find out/modules/lib/modules/* -name '*.ko') $dist_path/modules/
203-
cp out/modules/lib/modules/*/modules.{alias,dep,softdep} $dist_path/modules
204-
cp out/modules/lib/modules/*/modules.order $dist_path/modules/modules.load
205-
sed -i 's/\(kernel\/[^: ]*\/\)\([^: ]*\.ko\)/\/vendor\/lib\/modules\/\2/g' $dist_path/modules/modules.dep
206-
sed -i 's/.*\///g' $dist_path/modules/modules.load
222+
do_kernel_modules
207223
fi
208224
fi
209225
else

0 commit comments

Comments
 (0)