Merge pull request #1890 from Freescale/backport-1888-to-scarthgap

[Backport scarthgap] Fix uboot localversion
Freescale · Aug 1, 2024 · bf9b59b · bf9b59b
2 parents 0f8091c + 358dfab
commit bf9b59b
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass
@@ -17,21 +17,21 @@ UBOOT_LOCALVERSION = "${LOCALVERSION}"
 do_compile:prepend() {
 	if [ "${SCMVERSION}" = "y" ]; then
 		# Add GIT revision to the local version
-                if [ "${SRCREV}" = "INVALID" ]; then
-                        hash=${SRCREV_machine}
-                else
-                        hash=${SRCREV}
-                fi
-                if [ "$hash" = "AUTOINC" ]; then
-                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
-                else
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
-                fi
-                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
-                printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion
-                printf "%s%s%s%s" +g $head +p $patches > ${B}/.scmversion
-        else
+		if [ "${SRCREV}" = "INVALID" ]; then
+			hash=${SRCREV_machine}
+		else
+			hash=${SRCREV}
+		fi
+		if [ "$hash" = "AUTOINC" ]; then
+			branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
+			head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
+		else
+			head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
+		fi
+		patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
+		printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${S}/.scmversion
+		printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${B}/.scmversion
+	else
 		printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
 		printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
 	fi