patches for 6.0 6.1 restored

Author: Wojciech Gładysz

apply_patches.sh

@@ -39,33 +39,38 @@ 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 sources_$JETPACK_VERSION/hardware/nvidia/platform/t19x/galen-industrial-dts ]; then
+if [[ $1 == apply && -d sources_$JETPACK_VERSION/hardware/nvidia/platform/t19x/galen-industrial-dts ]]; then
     mv sources_$JETPACK_VERSION/hardware/nvidia/platform/t19x/galen-industrial-dts sources_$JETPACK_VERSION/hardware/nvidia/platform/t19x/galen-industrial
 fi
+if [[ $1 == reset && -d sources_$JETPACK_VERSION/hardware/nvidia/platform/t19x/galen-industrial ]]; then
+    rm -rfv sources_$JETPACK_VERSION/hardware/nvidia/platform/t19x/galen-industrial > /dev/null
+fi
 
 apply_external_patches() {
     if [ $1 = 'apply' ]; then
-        echo WOJTEK: git -C sources_$JETPACK_VERSION/$3 apply ${PWD}/$3/$2/*
-        git -C sources_$JETPACK_VERSION/$3 apply ${PWD}/$3/$2/*
+        ls -Ld sources_$JETPACK_VERSION/$3
+        ls -Lw1 ${PWD}/$3/$2
+        git -C sources_$JETPACK_VERSION/$3 apply -vq ${PWD}/$3/$2/*
     elif [ $1 = 'reset' ]; then
         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 $4
+        echo -n $(ls -d sources_$JETPACK_VERSION/$3):\ 
+            git -C sources_$JETPACK_VERSION/$3 reset --hard $4
     fi
 }
 
 apply_external_patches $1 $2 $D4XX_SRC_DST $L4T_VERSION
 
-if [ -d ${KERNEL_DIR}/${JETPACK_VERSION} ]; then
+if [ -d sources_$JETPACK_VERSION/$KERNEL_DIR ]; then
     apply_external_patches $1 $2 $KERNEL_DIR $L4T_VERSION
 fi
 
 if [[ "$JETPACK_VERSION" == "6.x" ]]; then
-    apply_external_patches $1 $2 hardware/nvidia/t23x/nv-public $L4T_VERSION
+    apply_external_patches $1 $JETPACK_VERSION hardware/nvidia/t23x/nv-public $L4T_VERSION
 else
     apply_external_patches $1 $2 hardware/nvidia/platform/t19x/galen/kernel-dts $L4T_VERSION
 fi
@@ -81,4 +86,5 @@ if [ $1 = 'apply' ]; then
 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
+    true
 fi

apply_patches_ext.sh

@@ -43,18 +43,19 @@ if [ -d $JETPACK_VERSION/hardware/nvidia/platform/t19x/galen-industrial-dts ]; t
 fi
 
 apply_external_patches() {
-    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
+    ls -Ld ${PWD}/$2/$1
+    ls -Lw1 ${PWD}/$2/$1
+    cat ${PWD}/$2/$1/* | patch --quiet -p1 --directory=${PWD}/sources_$JETPACK_VERSION/$2
 }
 
 apply_external_patches $1 $D4XX_SRC_DST
-if [ -d ${KERNEL_DIR}/${JETPACK_VERSION} ]; then
+
+if [ -d sources_$JETPACK_VERSION/$KERNEL_DIR ]; then
     apply_external_patches $1 $KERNEL_DIR
 fi
+
 if [[ "$JETPACK_VERSION" == "6.x" ]]; then
-    apply_external_patches $1 hardware/nvidia/t23x/nv-public
+    apply_external_patches $JETPACK_VERSION hardware/nvidia/t23x/nv-public
 else
     apply_external_patches $1 hardware/nvidia/platform/t19x/galen/kernel-dts
 fi

build_all.sh

@@ -26,9 +26,7 @@ fi
 
 if [[ "$JETPACK_VERSION" == "6.x" ]]; then
     export CROSS_COMPILE=$DEVDIR/l4t-gcc/$JETPACK_VERSION/bin/aarch64-buildroot-linux-gnu-
-elif [[ "$JETPACK_VERSION" == "5.1.2" ]]; then
-    export CROSS_COMPILE=$DEVDIR/l4t-gcc/$JETPACK_VERSION/bin/aarch64-buildroot-linux-gnu-
-elif [[ "$JETPACK_VERSION" == "5.0.2" ]]; then
+elif [[ "$JETPACK_VERSION" == "5.x" ]]; then
     export CROSS_COMPILE=$DEVDIR/l4t-gcc/$JETPACK_VERSION/bin/aarch64-buildroot-linux-gnu-
 elif [[ "$JETPACK_VERSION" == "4.6.1" ]]; then
     export CROSS_COMPILE=$DEVDIR/l4t-gcc/$JETPACK_VERSION/bin/aarch64-linux-gnu-

kernel/kernel-jammy-src/6.0/0001-kernel-enable-HID_SENSOR-without-USB-impact.patch

@@ -0,0 +1,46 @@
+From a28c524638e88665f3757002703a7add3e95643b Mon Sep 17 00:00:00 2001
+From: ejgoldik <ehud.joseph.goldik@intel.com>
+Date: Sun, 8 Jun 2025 11:08:56 +0300
+Subject: [PATCH] kernel: enable HID_SENSOR without USB impact
+
+Signed-off-by: Ehud J. Goldik <ehud.joseph.goldik@intel.com>
+---
+ arch/arm64/configs/defconfig | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
+index 57e2a364e..8fffc0a60 100644
+--- a/arch/arm64/configs/defconfig
++++ b/arch/arm64/configs/defconfig
+@@ -862,8 +862,10 @@ CONFIG_SND_SOC_LPASS_WSA_MACRO=m
+ CONFIG_SND_SOC_LPASS_VA_MACRO=m
+ CONFIG_SND_SIMPLE_CARD=m
+ CONFIG_SND_AUDIO_GRAPH_CARD=m
++CONFIG_HID=m
+ CONFIG_HIDRAW=y
+ CONFIG_HID_MULTITOUCH=m
++CONFIG_HID_SENSOR_HUB=m
+ CONFIG_I2C_HID_ACPI=m
+ CONFIG_I2C_HID_OF=m
+ CONFIG_USB=y
+@@ -1148,6 +1150,7 @@ CONFIG_EXTCON_USB_GPIO=y
+ CONFIG_EXTCON_USBC_CROS_EC=y
+ CONFIG_RENESAS_RPCIF=m
+ CONFIG_IIO=y
++CONFIG_HID_SENSOR_ACCEL_3D=m
+ CONFIG_EXYNOS_ADC=y
+ CONFIG_MAX9611=m
+ CONFIG_QCOM_SPMI_VADC=m
+@@ -1155,6 +1158,9 @@ CONFIG_QCOM_SPMI_ADC5=m
+ CONFIG_ROCKCHIP_SARADC=m
+ CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+ CONFIG_IIO_CROS_EC_SENSORS=m
++CONFIG_HID_SENSOR_IIO_COMMON=m
++CONFIG_HID_SENSOR_IIO_TRIGGER=m
++CONFIG_HID_SENSOR_GYRO_3D=m
+ CONFIG_IIO_ST_LSM6DSX=m
+ CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+ CONFIG_SENSORS_ISL29018=m
+-- 
+2.43.0
+

…lsense-camera-formats-jammy-master.patch …lsense-camera-formats-jammy-master.patchkernel/kernel-jammy-src/6.x/0002-realsense-camera-formats-jammy-master.patch renamed to kernel/kernel-jammy-src/6.0/0002-realsense-camera-formats-jammy-master.patch kernel/kernel-jammy-src/6.x/0002-realsense-camera-formats-jammy-master.patch renamed to kernel/kernel-jammy-src/6.0/0002-realsense-camera-formats-jammy-master.patch

@@ -0,0 +1 @@
+6.2