@@ -62,24 +62,14 @@ apply_external_patches() {
6262 fi
6363 ls -Ld " ${PWD} /$3 /$2 "
6464 ls -Lw1 " ${PWD} /$3 /$2 "
65- # Store the original commit hash before applying patches
66- ORIGINAL_COMMIT=$( git -C " sources_$SOURCES_VERSION /$3 " rev-parse HEAD)
67- echo " $ORIGINAL_COMMIT " > " sources_$SOURCES_VERSION /$3 /.realsense_patch_base"
6865 git -C " sources_$SOURCES_VERSION /$3 " apply " ${PWD} /$3 /$2 " /*
6966 elif [ " $1 " = " reset" ]; then
7067 if ! git -C " sources_$SOURCES_VERSION /$3 " diff --quiet || ! git -C " sources_$SOURCES_VERSION /$3 " diff --cached --quiet; then
7168 read -p " Repo sources_$SOURCES_VERSION /$3 has changes that will be hard reset. Continue (y/N)? " confirm
7269 [[ " $confirm " != " y" && " $confirm " != " Y" ]] && exit 1
7370 fi
7471 echo -n " $( ls -d " sources_$SOURCES_VERSION /$3 " ) : "
75- # Reset to original commit if .realsense_patch_base exists, otherwise use L4T_VERSION
76- if [[ -f " sources_$SOURCES_VERSION /$3 /.realsense_patch_base" ]]; then
77- RESET_TARGET=$( cat " sources_$SOURCES_VERSION /$3 /.realsense_patch_base" )
78- git -C " sources_$SOURCES_VERSION /$3 " reset --hard " $RESET_TARGET "
79- rm -f " sources_$SOURCES_VERSION /$3 /.realsense_patch_base"
80- else
81- git -C " sources_$SOURCES_VERSION /$3 " reset --hard $4
82- fi
72+ git -C " sources_$SOURCES_VERSION /$3 " reset --hard $4
8373 fi
8474}
8575
@@ -101,33 +91,4 @@ if [[ "$ACTION" = "apply" ]]; then
10191 else
10292 cp " hardware/realsense/${JP5_D4XX_DTSI} " " sources_$SOURCES_VERSION /hardware/nvidia/platform/t19x/galen/kernel-dts/common/tegra194-camera-d4xx.dtsi"
10393 fi
104-
105- # Stage all modified files after patching
106- git -C " sources_$SOURCES_VERSION /$D4XX_SRC_DST " add -A
107- [[ -d " sources_$SOURCES_VERSION /$KERNEL_DIR " ]] && git -C " sources_$SOURCES_VERSION /$KERNEL_DIR " add -A
108- git -C " sources_$SOURCES_VERSION /hardware/nvidia/platform/t19x/galen/kernel-dts" add -A || git -C " sources_$SOURCES_VERSION /hardware/nvidia/t23x/nv-public" add -A
109-
110- # Get author identity from root repo
111- GIT_AUTHOR_NAME=$( git config user.name)
112- GIT_AUTHOR_EMAIL=$( git config user.email)
113-
114- # Update local git identity for subrepos
115- git -C " sources_$SOURCES_VERSION /$D4XX_SRC_DST " config user.name " $GIT_AUTHOR_NAME "
116- git -C " sources_$SOURCES_VERSION /$D4XX_SRC_DST " config user.email " $GIT_AUTHOR_EMAIL "
117- if [[ -d " sources_$SOURCES_VERSION /$KERNEL_DIR " ]]; then
118- git -C " sources_$SOURCES_VERSION /$KERNEL_DIR " config user.name " $GIT_AUTHOR_NAME "
119- git -C " sources_$SOURCES_VERSION /$KERNEL_DIR " config user.email " $GIT_AUTHOR_EMAIL "
120- fi
121- if [[ -d " sources_$SOURCES_VERSION /hardware/nvidia/platform/t19x/galen/kernel-dts" ]]; then
122- git -C " sources_$SOURCES_VERSION /hardware/nvidia/platform/t19x/galen/kernel-dts" config user.name " $GIT_AUTHOR_NAME "
123- git -C " sources_$SOURCES_VERSION /hardware/nvidia/platform/t19x/galen/kernel-dts" config user.email " $GIT_AUTHOR_EMAIL "
124- elif [[ -d " sources_$SOURCES_VERSION /hardware/nvidia/t23x/nv-public" ]]; then
125- git -C " sources_$SOURCES_VERSION /hardware/nvidia/t23x/nv-public" config user.name " $GIT_AUTHOR_NAME "
126- git -C " sources_$SOURCES_VERSION /hardware/nvidia/t23x/nv-public" config user.email " $GIT_AUTHOR_EMAIL "
127- fi
128-
129- # Commit all staged files
130- git -C " sources_$SOURCES_VERSION /$D4XX_SRC_DST " commit -m " RS patched" || true
131- [[ -d " sources_$SOURCES_VERSION /$KERNEL_DIR " ]] && git -C " sources_$SOURCES_VERSION /$KERNEL_DIR " commit -m " RS patched" || true
132- git -C " sources_$SOURCES_VERSION /hardware/nvidia/platform/t19x/galen/kernel-dts" commit -m " RS patched" || git -C " sources_$SOURCES_VERSION /hardware/nvidia/t23x/nv-public" commit -m " RS patched" || true
13394fi
0 commit comments