init.insmod.sh: Find modules in different directories
Currenlty, kernel modules are only looked for in /vendor/lib/modules/. With this change, we enable kernel modules to be stored under paths that contain the kernel version string e.g. /vendor/lib/modules/5.10.31-gd527c4be4795-dirty/ This aligns better with the kernel build system. Bug: 185184472 Change-Id: I40db76f0409808700acd2d5524f8f3d606b3114f
This commit is contained in:
parent
51d3d2e56f
commit
5888eed0d1
1 changed files with 17 additions and 3 deletions
|
@ -7,6 +7,20 @@
|
||||||
### ... ###
|
### ... ###
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
|
modules_dir=
|
||||||
|
|
||||||
|
for f in /vendor/lib/modules/*/modules.dep /vendor/lib/modules/modules.dep; do
|
||||||
|
if [[ -f "$f" ]]; then
|
||||||
|
modules_dir="$(dirname "$f")"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ -z "${modules_dir}" ]]; then
|
||||||
|
echo "Unable to locate kernel modules directory" 2>&1
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# imitates wait_for_file() in init
|
# imitates wait_for_file() in init
|
||||||
wait_for_file()
|
wait_for_file()
|
||||||
{
|
{
|
||||||
|
@ -26,8 +40,8 @@ install_display_drivers()
|
||||||
if [[ -z "$panel_drv" ]]; then
|
if [[ -z "$panel_drv" ]]; then
|
||||||
panel_drv="panel-samsung-emul"
|
panel_drv="panel-samsung-emul"
|
||||||
fi
|
fi
|
||||||
modprobe -d /vendor/lib/modules exynos-drm.ko
|
modprobe -d "${modules_dir}" exynos-drm.ko
|
||||||
modprobe -d /vendor/lib/modules $panel_drv.ko
|
modprobe -d "${modules_dir}" $panel_drv.ko
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ $# -eq 1 ]; then
|
if [ $# -eq 1 ]; then
|
||||||
|
@ -47,7 +61,7 @@ if [ -f $cfg_file ]; then
|
||||||
"insmod") insmod $arg ;;
|
"insmod") insmod $arg ;;
|
||||||
"setprop") setprop $arg 1 ;;
|
"setprop") setprop $arg 1 ;;
|
||||||
"enable") echo 1 > $arg ;;
|
"enable") echo 1 > $arg ;;
|
||||||
"modprobe") modprobe -a -d /vendor/lib/modules $arg ;;
|
"modprobe") modprobe -a -d "${modules_dir}" $arg ;;
|
||||||
"wait") wait_for_file $arg ;;
|
"wait") wait_for_file $arg ;;
|
||||||
"install_display_drivers") install_display_drivers ;;
|
"install_display_drivers") install_display_drivers ;;
|
||||||
esac
|
esac
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue