1 files changed, 15 insertions, 15 deletions
diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass
index 94b30c04..90e86783 100644
--- 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
+                if [ "${SRCREV}" = "INVALID" ]; then
-                        hash=${SRCREV_machine}
+                        hash=${SRCREV_machine}
-                else
+                else
-                        hash=${SRCREV}
+                        hash=${SRCREV}
-                fi
+                fi
-                if [ "$hash" = "AUTOINC" ]; then
+                if [ "$hash" = "AUTOINC" ]; then
-                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
+                        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`
+                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
-                else
+                else
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
+                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
-                fi
+                fi
-                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
+                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 > ${S}/.scmversion
-                printf "%s%s%s%s" +g $head +p $patches > ${B}/.scmversion
+                printf "%s%s%s%s" +g $head +p $patches > ${B}/.scmversion
-        else
+        else
                printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
                printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
        fi

diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass index 94b30c04..90e86783 100644 --- a/classes/fsl-u-boot-localversion.bbclass +++ b/classes/fsl-u-boot-localversion.bbclass
@@ -17,21 +17,21 @@ UBOOT_LOCALVERSION = "${LOCALVERSION}"
17	do_compile:prepend() {	17	do_compile:prepend() {
18	if [ "${SCMVERSION}" = "y" ]; then	18	if [ "${SCMVERSION}" = "y" ]; then
19	# Add GIT revision to the local version	19	# Add GIT revision to the local version
20	if [ "${SRCREV}" = "INVALID" ]; then	20	if [ "${SRCREV}" = "INVALID" ]; then
21	hash=${SRCREV_machine}	21	hash=${SRCREV_machine}
22	else	22	else
23	hash=${SRCREV}	23	hash=${SRCREV}
24	fi	24	fi
25	if [ "$hash" = "AUTOINC" ]; then	25	if [ "$hash" = "AUTOINC" ]; then
26	branch=`git --git-dir=${S}/.git symbolic-ref --short -q HEAD`	26	branch=`git --git-dir=${S}/.git symbolic-ref --short -q HEAD`
27	head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`	27	head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
28	else	28	else
29	head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`	29	head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
30	fi	30	fi
31	patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`	31	patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
32	printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion	32	printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion
33	printf "%s%s%s%s" +g $head +p $patches > ${B}/.scmversion	33	printf "%s%s%s%s" +g $head +p $patches > ${B}/.scmversion
34	else	34	else
35	printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion	35	printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
36	printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion	36	printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
37	fi	37	fi