PR #14442 from remibettan: patches script for jetson - replacing uvcvideo in its relevant place

Author: Nir-Az

scripts/patch-realsense-ubuntu-L4T.sh

@@ -73,6 +73,7 @@ else
 	exit;
 fi
 
+# setting UBUNTU_CODENAME
 [[ -f /etc/os-release ]] && eval $(cat /etc/os-release|grep UBUNTU_CODENAME=)
 
 PATCHES_REV=""
@@ -191,21 +192,6 @@ else
 	make ARCH=arm64 defconfig -j$(($(nproc)-1))
 fi
 
-#Reuse existing module.symver
-kernel_ver=`uname -r`
-LINUX_HEADERS_NAME="linux-headers-${kernel_ver}-ubuntu18.04_aarch64"
-if [[ "$PATCHES_REV" = "5.0.2" ]]; then
-  LINUX_HEADERS_NAME="linux-headers-${kernel_ver}-ubuntu20.04_aarch64"
-fi
-if [[ "$PATCHES_REV" = "6.0" ]]; then
-  LINUX_HEADERS_NAME="linux-headers-${kernel_ver}-ubuntu22.04_aarch64"
-fi
-if [[ "$PATCHES_REV" = "7.0" ]]; then
-  LINUX_HEADERS_NAME="linux-headers-${kernel_ver}-ubuntu24.04_aarch64"
-fi
-
-export KBUILD_EXTRA_SYMBOLS="/lib/modules/${kernel_ver}/build/Module.symvers"
-
 #Jetpack prior to 4.4.1 requires manual reconfiguration of kernel
 if [[ "$PATCHES_REV" = "4.4" ]]; then
 	echo -e "\e[32mUpdate the kernel tree to support HID IMU sensors\e[0m"
@@ -214,8 +200,6 @@ if [[ "$PATCHES_REV" = "4.4" ]]; then
 	sed -i '/CONFIG_HID_SENSOR_IIO_COMMON/c\CONFIG_HID_SENSOR_IIO_COMMON=m\nCONFIG_HID_SENSOR_IIO_TRIGGER=m' .config
 fi
 
-make ARCH=arm64 prepare modules_prepare LOCALVERSION='' -j$(($(nproc)-1))
-
 #Remove previously applied patches
 git reset --hard
 echo -e "\e[32mApply Librealsense Kernel Patches\e[0m"
@@ -237,6 +221,13 @@ else
 	sed -i s'/1.1.1/1.1.1-realsense/'g ./drivers/media/usb/uvc/uvcvideo.h
 fi
 
+#Building modules_prepare, which:
+#1. Prepares kernel headers for building external modules
+#2. Generates Module.symvers if it doesn’t already exist.
+# Extract the local version suffix from the running kernel (e.g., "-tegra" or "")
+KERNEL_LOCALVERSION="$(uname -r | sed -E 's/^[0-9]+\.[0-9]+\.[0-9]+(-[0-9]+)?//')"
+make ARCH=arm64 prepare modules_prepare LOCALVERSION="${KERNEL_LOCALVERSION}" -j$(($(nproc)-1))
+
 echo -e "\e[32mCompiling uvcvideo kernel module\e[0m"
 #sudo -s make -j -C $KBASE M=$KBASE/drivers/media/usb/uvc/ modules
 make -j$(($(nproc)-1)) ARCH=arm64 M=drivers/media/usb/uvc/ modules
@@ -298,9 +289,17 @@ fi
 # update kernel module dependencies
 sudo depmod
 
+# special attention to uvcvideo because it is one of the files that is set to /lib/modules/`uname -r`/updates/ folder
+# when using our jetson drivers instructions
+UVCVIDEO_PATH=$(modinfo -F filename uvcvideo)
+if [[ -z "$UVCVIDEO_PATH" ]]; then
+    UVCVIDEO_PATH="/lib/modules/$(uname -r)/updates/uvcvideo.ko"
+    echo -e "\e[33mCould not find the uvcvideo kernel module.\nIt will be loaded into updates folder: $UVCVIDEO_PATH.\e[0m"
+fi
+
 echo -e "\e[32mInsert the modified kernel modules\e[0m"
 if version_lt "$PATCHES_REV" "6.0"; then
-	try_module_insert uvcvideo              ~/${TEGRA_TAG}-uvcvideo.ko                /lib/modules/`uname -r`/kernel/drivers/media/usb/uvc/uvcvideo.ko
+	try_module_insert uvcvideo              ~/${TEGRA_TAG}-uvcvideo.ko                $UVCVIDEO_PATH
 	try_load_module  uvcvideo
 	try_load_module  hid-sensor-gyro-3d
 	try_load_module  hid-sensor-accel-3d