specific release patches

Author: Wojciech Gładysz

apply_patches.sh

@@ -45,28 +45,29 @@ fi
 
 apply_external_patches() {
     if [ $1 = 'apply' ]; then
-        git -C sources_$JETPACK_VERSION/$2 apply ${PWD}/$2/$JETPACK_VERSION/*
+        echo WOJTEK: git -C sources_$JETPACK_VERSION/$3 apply ${PWD}/$3/$2/*
+        git -C sources_$JETPACK_VERSION/$3 apply ${PWD}/$3/$2/*
     elif [ $1 = 'reset' ]; then
-        if [[ -n $(git -C sources_$JETPACK_VERSION/$2 diff --quiet) || -n $(git -C sources_$JETPACK_VERSION/$2 diff --cached --quiet) ]]; then
-            read -p "Repo sources_$JETPACK_VERSION/$2 has changes that will be hard reset. Continue? (y/N): " confirm
+        if [[ -n $(git -C sources_$JETPACK_VERSION/$3 diff --quiet) || -n $(git -C sources_$JETPACK_VERSION/$3 diff --cached --quiet) ]]; then
+            read -p "Repo sources_$JETPACK_VERSION/$3 has changes that will be hard reset. Continue? (y/N): " confirm
             if [[ ! "$confirm" == "y" && ! "$confirm" == "Y" ]]; then
                 exit 1
             fi
         fi
-        git -C sources_$JETPACK_VERSION/$2 reset --hard $3
+        git -C sources_$JETPACK_VERSION/$2 reset --hard $4
     fi
 }
 
-apply_external_patches $1 $D4XX_SRC_DST $L4T_VERSION
+apply_external_patches $1 $2 $D4XX_SRC_DST $L4T_VERSION
 
 if [ -d ${KERNEL_DIR}/${JETPACK_VERSION} ]; then
-    apply_external_patches $1 $KERNEL_DIR $L4T_VERSION
+    apply_external_patches $1 $2 $KERNEL_DIR $L4T_VERSION
 fi
 
 if [[ "$JETPACK_VERSION" == "6.x" ]]; then
-    apply_external_patches $1 hardware/nvidia/t23x/nv-public $L4T_VERSION
+    apply_external_patches $1 $2 hardware/nvidia/t23x/nv-public $L4T_VERSION
 else
-    apply_external_patches $1 hardware/nvidia/platform/t19x/galen/kernel-dts $L4T_VERSION
+    apply_external_patches $1 $2 hardware/nvidia/platform/t19x/galen/kernel-dts $L4T_VERSION
 fi
 
 if [ $1 = 'apply' ]; then
@@ -79,4 +80,5 @@ if [ $1 = 'apply' ]; then
     fi
 elif [ $1 = 'reset' ]; then
     [[ -f $DEVDIR/sources_$JETPACK_VERSION/${D4XX_SRC_DST}/drivers/media/i2c/d4xx.c ]] && rm $DEVDIR/sources_$JETPACK_VERSION/${D4XX_SRC_DST}/drivers/media/i2c/d4xx.c
+    [[ -f $DEVDIR/sources_$JETPACK_VERSION/hardware/nvidia/platform/t19x/galen/kernel-dts/common/tegra194-camera-d4xx.dtsi ]] && rm $DEVDIR/sources_$JETPACK_VERSION/hardware/nvidia/platform/t19x/galen/kernel-dts/common/tegra194-camera-d4xx.dtsi
 fi

apply_patches_ext.sh

@@ -38,12 +38,15 @@ else
 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 $1/hardware/nvidia/platform/t19x/galen-industrial-dts ]; then
-    mv $1/hardware/nvidia/platform/t19x/galen-industrial-dts $1/hardware/nvidia/platform/t19x/galen-industrial
+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
 fi
 
 apply_external_patches() {
-    cat ${PWD}/$2/$JETPACK_VERSION/* | patch -p1 --directory=${PWD}/sources_$1/$2
+    ls -ld ${PWD}/$2/$JETPACK_VERSION
+    ls -ld ${PWD}/sources_$JETPACK_VERSION/$2
+    ls ${PWD}/$2/$JETPACK_VERSION
+    cat ${PWD}/$2/$JETPACK_VERSION/* | patch -p1 --directory=${PWD}/sources_$JETPACK_VERSION/$2
 }
 
 apply_external_patches $1 $D4XX_SRC_DST
@@ -57,10 +60,10 @@ else
 fi
 
 # For a common driver for JP4 + JP5 we override the i2c driver and ignore the previous that was created from patches
-cp $DEVDIR/kernel/realsense/d4xx.c $DEVDIR/sources_$1/${D4XX_SRC_DST}/drivers/media/i2c/
+cp $DEVDIR/kernel/realsense/d4xx.c $DEVDIR/sources_$JETPACK_VERSION/${D4XX_SRC_DST}/drivers/media/i2c/
 if [[ "$JETPACK_VERSION" == "6.x" ]]; then
     # jp6 overlay
-    cp $DEVDIR/hardware/realsense/tegra234-camera-d4xx-overlay*.dts $DEVDIR/sources_$1/hardware/nvidia/t23x/nv-public/overlay/
+    cp $DEVDIR/hardware/realsense/tegra234-camera-d4xx-overlay*.dts $DEVDIR/sources_$JETPACK_VERSION/hardware/nvidia/t23x/nv-public/overlay/
 else
-    cp $DEVDIR/hardware/realsense/$JP5_D4XX_DTSI $DEVDIR/sources_$1/hardware/nvidia/platform/t19x/galen/kernel-dts/common/tegra194-camera-d4xx.dtsi
+    cp $DEVDIR/hardware/realsense/$JP5_D4XX_DTSI $DEVDIR/sources_$JETPACK_VERSION/hardware/nvidia/platform/t19x/galen/kernel-dts/common/tegra194-camera-d4xx.dtsi
 fi

scripts/setup-common

@@ -18,12 +18,14 @@ if [[ "$JETPACK_VERSION" =~ ^6\.[0-2]$ ]]; then
 	    L4T_VERSION="jetson_36.3"
     fi;
     JETPACK_VERSION="6.x"
-elif [[ $JETPACK_VERSION == "5.1.2" ]]; then
-    L4T_VERSION="jetson_35.4.1"
-    KERNEL_DIR="kernel/kernel-5.10"
-elif [[ $JETPACK_VERSION == "5.0.2" ]]; then
-    L4T_VERSION="jetson_35.1"
+elif [[ "$JETPACK_VERSION" =~ 5.[0-1].2" ]]; then
     KERNEL_DIR="kernel/kernel-5.10"
+    if [[ $JETPACK_VERSION == "5.1.2" ]]; then
+	    L4T_VERSION="jetson_35.4.1"
+    elif [[ $JETPACK_VERSION == "5.0.2" ]]; then
+	    L4T_VERSION="jetson_35.1"
+    fi
+    JETPACK_VERSION="5.x"
 elif [[ $JETPACK_VERSION == "4.6.1" ]]; then
     L4T_VERSION="tegra-l4t-r32.7.1"
     KERNEL_DIR="kernel/kernel-4.9"