From e4b424c9893ef686bb786ab148bc5eec7099f78a Mon Sep 17 00:00:00 2001 From: Alfonso Gamboa Date: Wed, 15 Jun 2022 19:47:29 -0700 Subject: [PATCH] revise extra kernel modules path --- SD_ROOT/wz_mini/etc/init.d/wz_cam.sh | 12 ++++++------ SD_ROOT/wz_mini/etc/init.d/wz_init.sh | 8 ++++---- SD_ROOT/wz_mini/etc/init.d/wz_post.sh | 12 ++++++------ .../lib/modules/3.10.14/{kernel => extra}/audio.ko | Bin .../3.10.14/{kernel => extra}/audio_webcam.ko | Bin .../3.10.14/{kernel => extra}/libcomposite.ko | Bin .../modules/3.10.14/{kernel => extra}/usbcamera.ko | Bin .../3.10.14/{kernel => extra}/v4l2loopback_V2.ko | Bin .../3.10.14/{kernel => extra}/videobuf2-vmalloc.ko | Bin .../{kernel => extra}/8189fs_wz.ko | Bin .../{kernel => extra}/audio.ko | Bin .../{kernel => extra}/usbcamera.ko | Bin .../{kernel => extra}/v4l2loopback.ko | Bin .../{kernel => extra}/videobuf2-vmalloc.ko | Bin 14 files changed, 16 insertions(+), 16 deletions(-) rename SD_ROOT/wz_mini/lib/modules/3.10.14/{kernel => extra}/audio.ko (100%) rename SD_ROOT/wz_mini/lib/modules/3.10.14/{kernel => extra}/audio_webcam.ko (100%) rename SD_ROOT/wz_mini/lib/modules/3.10.14/{kernel => extra}/libcomposite.ko (100%) rename SD_ROOT/wz_mini/lib/modules/3.10.14/{kernel => extra}/usbcamera.ko (100%) rename SD_ROOT/wz_mini/lib/modules/3.10.14/{kernel => extra}/v4l2loopback_V2.ko (100%) rename SD_ROOT/wz_mini/lib/modules/3.10.14/{kernel => extra}/videobuf2-vmalloc.ko (100%) rename SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/{kernel => extra}/8189fs_wz.ko (100%) rename SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/{kernel => extra}/audio.ko (100%) rename SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/{kernel => extra}/usbcamera.ko (100%) rename SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/{kernel => extra}/v4l2loopback.ko (100%) rename SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/{kernel => extra}/videobuf2-vmalloc.ko (100%) diff --git a/SD_ROOT/wz_mini/etc/init.d/wz_cam.sh b/SD_ROOT/wz_mini/etc/init.d/wz_cam.sh index a399722..eb94b38 100755 --- a/SD_ROOT/wz_mini/etc/init.d/wz_cam.sh +++ b/SD_ROOT/wz_mini/etc/init.d/wz_cam.sh @@ -56,8 +56,8 @@ if [ "$V2" == "false" ]; then insmod /system/driver/sensor_gc2053_t31.ko insmod /system/driver/audio.ko insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/drivers/usb/gadget/libcomposite.ko - insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/videobuf2-vmalloc.ko - insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/usbcamera.ko + insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/videobuf2-vmalloc.ko + insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/usbcamera.ko cd /system/bin/ /system/bin/ucamera & @@ -98,14 +98,14 @@ else insmod /driver/tx-isp.ko isp_clk=100000000 insmod /driver/exfat.ko insmod /driver/sample_motor.ko - insmod /opt/wz_mini/lib/modules/3.10.14/kernel/audio_webcam.ko + insmod /opt/wz_mini/lib/modules/3.10.14/extra/audio_webcam.ko insmod /driver/sinfo.ko insmod /driver/sample_pwm_core.ko insmod /driver/sample_pwm_hal.ko - insmod /opt/wz_mini/lib/modules/3.10.14/kernel/libcomposite.ko - insmod /opt/wz_mini/lib/modules/3.10.14/kernel/videobuf2-vmalloc.ko - insmod /opt/wz_mini/lib/modules/3.10.14/kernel/usbcamera.ko + insmod /opt/wz_mini/lib/modules/3.10.14/extra/libcomposite.ko + insmod /opt/wz_mini/lib/modules/3.10.14/extra/videobuf2-vmalloc.ko + insmod /opt/wz_mini/lib/modules/3.10.14/extra/usbcamera.ko /opt/wz_mini/usr/bin/getSensorType /opt/wz_mini/usr/bin/ucamera_v2 & diff --git a/SD_ROOT/wz_mini/etc/init.d/wz_init.sh b/SD_ROOT/wz_mini/etc/init.d/wz_init.sh index 2246339..c9354df 100755 --- a/SD_ROOT/wz_mini/etc/init.d/wz_init.sh +++ b/SD_ROOT/wz_mini/etc/init.d/wz_init.sh @@ -67,11 +67,11 @@ if [[ -e /opt/wz_mini/etc/.first_boot ]]; then else echo "first boot, initializing" if [[ "$V2" == "true" ]]; then - insmod /opt/wz_mini/lib/modules/3.10.14/kernel/audio.ko + insmod /opt/wz_mini/lib/modules/3.10.14/extra/audio.ko LD_LIBRARY_PATH='/opt/wz_mini/lib' /opt/wz_mini/bin/audioplay_t20 /opt/wz_mini/usr/share/audio/init_v2.wav $AUDIO_PROMPT_VOLUME rmmod audio else - insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/audio.ko spk_gpio=$GPIO alc_mode=0 mic_gain=0 + insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/audio.ko spk_gpio=$GPIO alc_mode=0 mic_gain=0 /opt/wz_mini/bin/audioplay_t31 /opt/wz_mini/usr/share/audio/init.wav $AUDIO_PROMPT_VOLUME rmmod audio fi @@ -143,11 +143,11 @@ chmod 400 /etc/shadow if [[ -e /opt/wz_mini/swap.gz ]]; then if [[ "$V2" == "true" ]]; then - insmod /opt/wz_mini/lib/modules/3.10.14/kernel/audio.ko + insmod /opt/wz_mini/lib/modules/3.10.14/extra/audio.ko LD_LIBRARY_PATH='/opt/wz_mini/lib' /opt/wz_mini/bin/audioplay_t20 /opt/wz_mini/usr/share/audio/swap_v2.wav $AUDIO_PROMPT_VOLUME rmmod audio else - insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/audio.ko spk_gpio=$GPIO alc_mode=0 mic_gain=0 + insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/audio.ko spk_gpio=$GPIO alc_mode=0 mic_gain=0 /opt/wz_mini/bin/audioplay_t31 /opt/wz_mini/usr/share/audio/swap.wav $AUDIO_PROMPT_VOLUME rmmod audio fi diff --git a/SD_ROOT/wz_mini/etc/init.d/wz_post.sh b/SD_ROOT/wz_mini/etc/init.d/wz_post.sh index 6ae2abf..16921c3 100755 --- a/SD_ROOT/wz_mini/etc/init.d/wz_post.sh +++ b/SD_ROOT/wz_mini/etc/init.d/wz_post.sh @@ -52,26 +52,26 @@ if [[ "$RTSP_HI_RES_ENABLED" == "true" ]] || [[ "$RTSP_LOW_RES_ENABLED" == "tru if [[ "$RTSP_LOW_RES_ENABLED" == "true" ]] && [[ "$RTSP_HI_RES_ENABLED" == "true" ]]; then if [[ "$V2" == "true" ]]; then echo "load video loopback driver at video6 video7" - insmod /opt/wz_mini/lib/modules/3.10.14/kernel/v4l2loopback_V2.ko video_nr=6,7 + insmod /opt/wz_mini/lib/modules/3.10.14/extra/v4l2loopback_V2.ko video_nr=6,7 else echo "load video loopback driver at video1 video2" - insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/v4l2loopback.ko video_nr=1,2 + insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/v4l2loopback.ko video_nr=1,2 fi elif [[ "$RTSP_LOW_RES_ENABLED" == "true" ]]; then if [[ "$V2" == "true" ]]; then echo "load video loopback driver at video7" - insmod /opt/wz_mini/lib/modules/3.10.14/kernel/v4l2loopback_V2.ko video_nr=7 + insmod /opt/wz_mini/lib/modules/3.10.14/extra/v4l2loopback_V2.ko video_nr=7 else echo "load video loopback driver at video2" - insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/v4l2loopback.ko video_nr=2 + insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/v4l2loopback.ko video_nr=2 fi elif [[ "$RTSP_HI_RES_ENABLED" == "true" ]]; then if [[ "$V2" == "true" ]]; then echo "load video loopback driver at video6" - insmod /opt/wz_mini/lib/modules/3.10.14/kernel/v4l2loopback_V2.ko video_nr=6 + insmod /opt/wz_mini/lib/modules/3.10.14/extra/v4l2loopback_V2.ko video_nr=6 else echo "load video loopback driver at video1" - insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/v4l2loopback.ko video_nr=1 + insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/v4l2loopback.ko video_nr=1 fi fi diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/audio.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14/extra/audio.ko similarity index 100% rename from SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/audio.ko rename to SD_ROOT/wz_mini/lib/modules/3.10.14/extra/audio.ko diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/audio_webcam.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14/extra/audio_webcam.ko similarity index 100% rename from SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/audio_webcam.ko rename to SD_ROOT/wz_mini/lib/modules/3.10.14/extra/audio_webcam.ko diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/libcomposite.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14/extra/libcomposite.ko similarity index 100% rename from SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/libcomposite.ko rename to SD_ROOT/wz_mini/lib/modules/3.10.14/extra/libcomposite.ko diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/usbcamera.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14/extra/usbcamera.ko similarity index 100% rename from SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/usbcamera.ko rename to SD_ROOT/wz_mini/lib/modules/3.10.14/extra/usbcamera.ko diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/v4l2loopback_V2.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14/extra/v4l2loopback_V2.ko similarity index 100% rename from SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/v4l2loopback_V2.ko rename to SD_ROOT/wz_mini/lib/modules/3.10.14/extra/v4l2loopback_V2.ko diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/videobuf2-vmalloc.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14/extra/videobuf2-vmalloc.ko similarity index 100% rename from SD_ROOT/wz_mini/lib/modules/3.10.14/kernel/videobuf2-vmalloc.ko rename to SD_ROOT/wz_mini/lib/modules/3.10.14/extra/videobuf2-vmalloc.ko diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/8189fs_wz.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/8189fs_wz.ko similarity index 100% rename from SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/8189fs_wz.ko rename to SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/8189fs_wz.ko diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/audio.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/audio.ko similarity index 100% rename from SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/audio.ko rename to SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/audio.ko diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/usbcamera.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/usbcamera.ko similarity index 100% rename from SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/usbcamera.ko rename to SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/usbcamera.ko diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/v4l2loopback.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/v4l2loopback.ko similarity index 100% rename from SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/v4l2loopback.ko rename to SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/v4l2loopback.ko diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/videobuf2-vmalloc.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/videobuf2-vmalloc.ko similarity index 100% rename from SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/videobuf2-vmalloc.ko rename to SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/videobuf2-vmalloc.ko