git action handling reworked, readme files reviewed

Author: Kontra2B

README.md

@@ -30,8 +30,7 @@ Please follow the [instruction](https://docs.nvidia.com/sdk-manager/install-with
 # JetPack build
 
 - [JetPack 6.x](./README_JP6.md#build-environment-prerequisites)
-- [JetPack 5.1.2](./README_JP5.md#build-kernel-dtb-and-d457-driver)
-- [JetPack 5.0.2](./README_JP5.md#build-kernel-dtb-and-d457-driver)
+- [JetPack 5.x.2](./README_JP5.md#build-kernel-dtb-and-d457-driver)
 - [JetPack 4.6.1](./README_JP4.md#build-kernel-dtb-and-d457-driver)
 
 ### Verify driver after installation

README_JP4.md

@@ -12,7 +12,7 @@ The system shall include:
 
 ### Links
 - Intel® RealSense™ camera driver for GMSL* interface [Front Page](./README.md)
-- Jetson AGX Orin™ board setup - AGX Orin™ [JetPack 6.0](./README_JP6.md) setup guide
+- Jetson AGX Orin™ board setup - AGX Orin™ [JetPack 6.x](./README_JP6.md) setup guide
 - Jetson AGX Xavier™ board setup - AGX Xavier™ [JetPack 5.x.2](./README_JP5.md) setup guide
 - Jetson AGX Xavier™ board setup - AGX Xavier™ [JetPack 4.6.1](./README_JP4.md) setup guide
 - Build Tools manual page [Build Manual page](./README_tools.md)
@@ -54,7 +54,7 @@ cd ../../..
 sudo apt install build-essential bc flex bison
 
 # apply patches
-./apply_patches_ext.sh ./Linux_for_Tegra/source/public 4.6.1
+./apply_patches_ext.sh 4.6.1 ./Linux_for_Tegra/source/public
 
 # remove BUILD_NUMBER env dependency kernel vermagic
 sed -i s/'UTS_RELEASE=\$(KERNELRELEASE)-ab\$(BUILD_NUMBER)'/'UTS_RELEASE=\$(KERNELRELEASE)'/g ./Linux_for_Tegra/source/public/kernel/kernel-4.9/Makefile
@@ -170,4 +170,4 @@ echo 1 | sudo tee /sys/bus/i2c/drivers/max9295/30-0040/refresh_setting
 echo 1 | sudo tee /sys/bus/i2c/drivers/max9296/30-0048/refresh_setting
 ```
 **NOTE**
-- It's recommended to save the original kernel image as backup boot option in `/boot/extlinux/extlinux.conf`.
+- It's recommended to save the original kernel image as backup boot option in `/boot/extlinux/extlinux.conf`.

README_JP5.md

@@ -12,7 +12,7 @@ The system shall include:
 
 ### Links
 - Intel® RealSense™ camera driver for GMSL* interface [Front Page](./README.md)
-- Jetson AGX Orin™ board setup - AGX Orin™ [JetPack 6.0](./README_JP6.md) setup guide
+- Jetson AGX Orin™ board setup - AGX Orin™ [JetPack 6.x](./README_JP6.md) setup guide
 - Jetson AGX Xavier™ board setup - AGX Xavier™ [JetPack 5.x.2](./README_JP5.md) setup guide
 - Jetson AGX Xavier™ board setup - AGX Xavier™ [JetPack 4.6.1](./README_JP4.md) setup guide
 - Build Tools manual page [Build Manual page](./README_tools.md)
@@ -37,8 +37,8 @@ Download Jetson Linux source code tarball from
 
 ## JetPack 5.1.2
 ```
-mkdir -p l4t-gcc/5.1.2
-cd ./l4t-gcc/5.1.2
+mkdir -p l4t-gcc/5.x
+cd ./l4t-gcc/5.x
 wget https://developer.nvidia.com/embedded/jetson-linux/bootlin-toolchain-gcc-93 -O aarch64--glibc--stable-final.tar.gz
 tar xf aarch64--glibc--stable-final.tar.gz
 cd ../..
@@ -49,8 +49,8 @@ tar xjf kernel_src.tbz2
 ```
 ## JetPack 5.0.2
 ```
-mkdir -p l4t-gcc/5.0.2
-cd ./l4t-gcc/5.0.2
+mkdir -p l4t-gcc/5.x
+cd ./l4t-gcc/5.x
 wget https://developer.nvidia.com/embedded/jetson-linux/bootlin-toolchain-gcc-93 -O aarch64--glibc--stable-final.tar.gz
 tar xf aarch64--glibc--stable-final.tar.gz --strip-components 1
 cd ../..
@@ -68,7 +68,7 @@ cd ../../..
 sudo apt install build-essential bc flex bison
 
 # apply patches
-./apply_patches_ext.sh ./Linux_for_Tegra/source/public 5.0.2
+./apply_patches_ext.sh 5.0.2 ./Linux_for_Tegra/source/public
 
 # build kernel, dtb and D457 driver
 ./build_all.sh 5.0.2 ./Linux_for_Tegra/source/public
@@ -108,21 +108,21 @@ Building with `build_all.sh`
 
 The necessary files are:
 
-- kernel image `images/<JetPack_version>/arch/arm64/boot/Image`
-- dtb `images/5.0.2/arch/arm64/boot/dts/nvidia/tegra194-p2888-0001-p2822-0000.dtb`
-- D457 driver `images/5.0.2/drivers/media/i2c/d4xx.ko`
-- UVC Video driver `images/5.0.2/drivers/media/usb/uvc/uvcvideo.ko`
-- V4L2 Core Video driver `images/5.0.2/drivers/media/v4l2-core/videobuf-core.ko`
-- V4L2 VMalloc Video driver `images/5.0.2/drivers/media/v4l2-core/videobuf-vmalloc.ko`
+- kernel image `images/5.x/arch/arm64/boot/Image`
+- dtb `images/5.x/arch/arm64/boot/dts/nvidia/tegra194-p2888-0001-p2822-0000.dtb`
+- D457 driver `images/5.x/drivers/media/i2c/d4xx.ko`
+- UVC Video driver `images/5.x/drivers/media/usb/uvc/uvcvideo.ko`
+- V4L2 Core Video driver `images/5.x/drivers/media/v4l2-core/videobuf-core.ko`
+- V4L2 VMalloc Video driver `images/5.x/drivers/media/v4l2-core/videobuf-vmalloc.ko`
 
 Copy build results from Host to Jetson target `10.0.0.116` user `nvidia`
 ```
-scp ./images/5.0.2/arch/arm64/boot/Image nvidia@10.0.0.116:~/
-scp ./images/5.0.2/arch/arm64/boot/dts/nvidia/tegra194-p2888-0001-p2822-0000.dtb nvidia@10.0.0.116:~/
-scp ./images/5.0.2/drivers/media/i2c/d4xx.ko nvidia@10.0.0.116:~/
-scp ./images/5.0.2/drivers/media/usb/uvc/uvcvideo.ko nvidia@10.0.0.116:~/
-scp ./images/5.0.2/drivers/media/v4l2-core/videobuf-core.ko nvidia@10.0.0.116:~/
-scp ./images/5.0.2/drivers/media/v4l2-core/videobuf-vmalloc.ko nvidia@10.0.0.116:~/
+scp ./images/5.x/arch/arm64/boot/Image nvidia@10.0.0.116:~/
+scp ./images/5.x/arch/arm64/boot/dts/nvidia/tegra194-p2888-0001-p2822-0000.dtb nvidia@10.0.0.116:~/
+scp ./images/5.x/drivers/media/i2c/d4xx.ko nvidia@10.0.0.116:~/
+scp ./images/5.x/drivers/media/usb/uvc/uvcvideo.ko nvidia@10.0.0.116:~/
+scp ./images/5.x/drivers/media/v4l2-core/videobuf-core.ko nvidia@10.0.0.116:~/
+scp ./images/5.x/drivers/media/v4l2-core/videobuf-vmalloc.ko nvidia@10.0.0.116:~/
 ```
 
 Copy them to the right places on Jetson target:

README_JP6.md

@@ -4,9 +4,9 @@
 The Intel® RealSense™ MIPI platform driver enables the user to control and stream RealSense™ 3D MIPI cameras.
 The system shall include:
 * NVIDIA® Jetson™ platform Supported JetPack versions are:
-    [6.2 production release](https://developer.nvidia.com/embedded/jetpack-sdk-62)
-    [6.1 production release](https://developer.nvidia.com/embedded/jetpack-sdk-61)
-    [6.0 production release](https://developer.nvidia.com/embedded/jetpack-sdk-60)
+- [6.2 production release](https://developer.nvidia.com/embedded/jetpack-sdk-62)
+- [6.1 production release](https://developer.nvidia.com/embedded/jetpack-sdk-61)
+- [6.0 production release](https://developer.nvidia.com/embedded/jetpack-sdk-60)
 * RealSense™ [De-Serialize board](https://store.intelrealsense.com/buy-intel-realsense-des457.html)
 * Jetson AGX Orin™ Passive adapter board from [Leopard Imaging® LI-JTX1-SUB-ADPT](https://leopardimaging.com/product/accessories/adapters-carrier-boards/for-nvidia-jetson/li-jtx1-sub-adpt/)
 * RS MIPI camera [D457](https://store.intelrealsense.com/buy-intel-realsense-depth-camera-d457.html)
@@ -93,6 +93,7 @@ Note: dev_dbg() log support will not be enabled by default. If needed, run the `
 ```
 
 ## Archive JetPack 6.x build results (optional) on build host
+Assuning 6.0 build the kernel version is 5.15.136-tegra. For 6.1 and 6.2 build the kernel version is 5.15.148-tegra.
 - kernel image : `images/6.x/rootfs/boot/Image`
 - dtb: `images/6.x/rootfs/boot/dtb/tegra234-p3737-0000+p3701-0000-nv.dtb`
 - dtb overlay: `images/6.x/rootfs/boot/tegra234-camera-d4xx-overlay.dtbo`

README_driver.md

@@ -4,7 +4,7 @@
 
 ### Links
 - Intel® RealSense™ camera driver for GMSL* interface [Front Page](./README.md)
-- NVIDIA® Jetson AGX Orin™ board setup - AGX Orin™ [JetPack 6.0](./README_JP6.md) setup guide
+- NVIDIA® Jetson AGX Orin™ board setup - AGX Orin™ [JetPack 6.x](./README_JP6.md) setup guide
 - NVIDIA® Jetson AGX Xavier™ board setup - AGX Xavier™ [JetPack 5.x.2](./README_JP5.md) setup guide
 - NVIDIA® Jetson AGX Xavier™ board setup - AGX Xavier™ [JetPack 4.6.1](./README_JP4.md) setup guide
 - Build Tools manual page [Build Manual page](./README_tools.md)

README_tools.md

@@ -4,7 +4,7 @@
 
 ### Links
 - Intel® RealSense™ camera driver for GMSL* interface [Front Page](./README.md)
-- NVIDIA® Jetson AGX Orin™ board setup - AGX Orin™ [JetPack 6.0](./README_JP6.md) setup guide
+- NVIDIA® Jetson AGX Orin™ board setup - AGX Orin™ [JetPack 6.x](./README_JP6.md) setup guide
 - NVIDIA® Jetson AGX Xavier™ board setup - AGX Xavier™ [JetPack 5.x.2](./README_JP5.md) setup guide
 - NVIDIA® Jetson AGX Xavier™ board setup - AGX Xavier™ [JetPack 4.6.1](./README_JP4.md) setup guide
 - Build Tools manual page [Build Manual page](./README_tools.md)
@@ -25,9 +25,8 @@ This script prepare all necessary tools and sources to build JetPack BSP.
 
 The following directories will be created:
 - JetPack 4.6.1: `sources_4.6.1`
-- JetPack 5.0.2: `sources_5.0.2`
-- JetPack 5.1.2: `sources_5.1.2`
-- JetPack 6.0: `sources_6.0`
+- JetPack 5.x.2: `sources_5.x`
+- JetPack 6.x: `sources_6.x`
 ```
 ./setup_workspace.sh [JetPack_version]
 ```
@@ -41,7 +40,7 @@ Apply D457 patches for kernel image, dtb and D457 driver.
 ```
 ./apply_patches.sh [--one-cam | --dual-cam] apply [JetPack_version]
 ```
-Reset D457 patches for kernel image, dtb and D457 driver.
+Reset D457 patches (and any other changes) for kernel image, dtb and D457 driver.
 ```
 ./apply_patches.sh reset [JetPack_version]
 ```
@@ -58,15 +57,15 @@ When setup_workspace.sh was not used, using sources direct download method (exam
 
 Apply D457 patches for external build the kernel image, dtb and D457 driver.
 ```
-./apply_patches_ext.sh [--one-cam | --dual-cam] ./Linux_for_tegra/source/public [JetPack_version]
+./apply_patches_ext.sh [--one-cam | --dual-cam] [JetPack_version] [./Linux_for_tegra/source/public] 
 ```
 Example: for JP5.0.2, source path is ./Linux_for_tegra/source :
 ```
-./apply_patches_ext.sh ./Linux_for_tegra/source 5.0.2
+./apply_patches_ext.sh 5.0.2 ./Linux_for_tegra/source
 ```
 
 # build_all.sh
-build kernel and modules only
+Build kernel and modules only
 ```
 ./build_all.sh [JetPack_version] [JetPack_source_dir]
 ```
@@ -80,9 +79,8 @@ Example: build JetPack 5.0.2 workspace created by direct source download
 ```
 The following directories will be created:
 - JetPack 4.6.1: `images/4.6.1`
-- JetPack 5.0.2: `images/5.0.2`
-- JetPack 5.1.2: `images/5.1.2`
-- JetPack 6.0: `images/6.0`
+- JetPack 5.x.2: `images/5.x`
+- JetPack 6.x: `images/6.x`
 
 # build_all_deb.sh
 Build kernel Debian packages for JetPack 5.0.2 or 4.6.1
@@ -103,4 +101,4 @@ Example:
 
 - Each JetPack version's kernel may be different, the user needs to change the kernel version in file names and paths accordingly, for example for JetPack 4.6.1 the version is `4.9.253-d457` or `4.9.253-tegra`, depending on the build method applied.
 - For JetPack 4.6.1, the dtb file is not included in the deb package. User needs to manually copy `images/4.6.1/arch/arm64/boot/dts/tegra194-p2888-0001-p2822-0000.dtb` file to board and edit `extlinux.conf` to point to it.
-- It's recommended to save the original kernel image as backup boot option in `/boot/extlinux/extlinux.conf`.
+- It's recommended to save the original kernel image as backup boot option in `/boot/extlinux/extlinux.conf`.

apply_patches_ext.sh

@@ -39,7 +39,7 @@ fi
 # NVIDIA SDK Manager's JetPack 4.6.1 source_sync.sh doesn't set the right folder name, it mismatches with the direct tar
 # package source code. Correct the folder name.
 if [ -d $JETPACK_VERSION/hardware/nvidia/platform/t19x/galen-industrial-dts ]; then
-    mv $1/hardware/nvidia/platform/t19x/galen-industrial-dts $JETPACK_VERSION/hardware/nvidia/platform/t19x/galen-industrial
+    mv $JETPACK_VERSION/hardware/nvidia/platform/t19x/galen-industrial-dts $JETPACK_VERSION/hardware/nvidia/platform/t19x/galen-industrial
 fi
 
 apply_external_patches() {

scripts/source_sync_4.6.1.sh

@@ -171,21 +171,22 @@ function DownloadAndSync {
 
 	if [ -d "${LDK_SOURCE_DIR}" ]; then
 		echo "Directory for $WHAT, ${LDK_SOURCE_DIR}, already exists!"
-		pushd "${LDK_SOURCE_DIR}" > /dev/null
-		if ! git status 2>&1 >/dev/null; then
+		if ! git -C $LDK_SOURCE_DIR status 2>&1 >/dev/null; then
 			echo "But the directory is not a git repository -- clean it up first"
 			echo ""
 			popd > /dev/null
+			return 1
+		fi
+		if ! git -C $LDK_SOURCE_DIR fetch --all 2>&1 >/dev/null; then
+			echo "$2 source sync failed"
 			return 2
 		fi
-		git fetch --all 2>&1 >/dev/null
-		popd > /dev/null
 	else
 		echo "Downloading default $WHAT source..."
 
 		if ! git clone -n "$REPO_URL" ${LDK_SOURCE_DIR} 2>&1 >/dev/null; then
 			echo "$2 source sync failed"
-			return 1
+			return 3
 		fi
 
 		echo "The default $WHAT source is downloaded in: ${LDK_SOURCE_DIR}"
@@ -207,13 +208,13 @@ function DownloadAndSync {
 			else
 				echo "$2 could not sync to tag $TAG!"
 				echo
-				return 3
+				return 4
 			fi
 		else
 			echo "Couldn't find tag $TAG"
 			echo "$2 source sync to tag $TAG failed!"
 			echo
-			return 4
+			return 5
 		fi
 	fi
 	echo
@@ -315,9 +316,11 @@ for ((i=0; i < NSOURCES; i++)); do
 		if DownloadAndSync "$WHAT" "${LDK_DIR}/${WHAT}" "https://${REPO}" "${TAG}" "${OPT}"; then
 			true
 		else
-			if [[ $? == 1 ]]; then
+			if [[ $? == 3 ]]; then
 				echo "Trying git protocol"
 				DownloadAndSync "$WHAT" "${LDK_DIR}/${WHAT}" "git://${REPO}" "${TAG}" "${OPT}"
+			else
+				exit 1
 			fi
 		fi
 	fi

scripts/source_sync_5.0.2.sh

@@ -115,7 +115,7 @@ function Usages {
 	echo "Available general options are,"
 	echo "     -h     :     help"
 	echo "     -d [DIR] : root of source is DIR"
-	echo "     -t [TAG] : Git tag that will be used to sync all the sources"
+	echo "     -t [TAG] : git tag that will be used to sync all the sources"
 	echo ""
 	echo "By default, all sources are downloaded."
 	echo "Only specified sources are downloaded, if one or more of the following options are mentioned."
@@ -182,21 +182,22 @@ function DownloadAndSync {
 
 	if [ -d "${LDK_SOURCE_DIR}" ]; then
 		echo "Directory for $WHAT, ${LDK_SOURCE_DIR}, already exists!"
-		pushd "${LDK_SOURCE_DIR}" > /dev/null
-		if ! git status 2>&1 >/dev/null; then
+		if ! git -C $LDK_SOURCE_DIR status 2>&1 >/dev/null; then
 			echo "But the directory is not a git repository -- clean it up first"
 			echo ""
 			popd > /dev/null
+			return 1
+		fi
+		if ! git -C $LDK_SOURCE_DIR fetch --all 2>&1 >/dev/null; then
+			echo "$2 source sync failed"
 			return 2
 		fi
-		git fetch --all 2>&1 >/dev/null
-		popd > /dev/null
 	else
 		echo "Downloading default $WHAT source..."
 
 		if ! git clone -n "$REPO_URL" ${LDK_SOURCE_DIR} 2>&1 >/dev/null; then
-			echo "$2 source sync failed!"
-			return 1
+			echo "$2 source sync failed"
+			return 3
 		fi
 
 		echo "The default $WHAT source is downloaded in: ${LDK_SOURCE_DIR}"
@@ -218,20 +219,20 @@ function DownloadAndSync {
 			else
 				echo "$2 could not sync to tag $TAG!"
 				echo
-				return 3
+				return 4
 			fi
 		else
 			echo "Couldn't find tag $TAG"
 			echo "$2 source sync to tag $TAG failed!"
 			echo
-			return 4
+			return 5
 		fi
 	fi
 	echo
 }
 
 # prepare processing ....
-GETOPT=":ehd:t:"
+GETOPT=":hd:t:"
 
 OIFS="$IFS"
 IFS=$(echo -en "\n\b")
@@ -326,9 +327,11 @@ for ((i=0; i < NSOURCES; i++)); do
 		if DownloadAndSync "$WHAT" "${LDK_DIR}/${WHAT}" "https://${REPO}" "${TAG}" "${OPT}"; then
 			true
 		else
-			if [[ $? == 1 ]]; then
+			if [[ $? == 3 ]]; then
 				echo "Trying git protocol"
 				DownloadAndSync "$WHAT" "${LDK_DIR}/${WHAT}" "git://${REPO}" "${TAG}" "${OPT}"
+			else
+				exit 1
 			fi
 		fi
 	fi