2 files changed, 27 insertions, 7 deletions

diff --git a/classes/fsl-kernel-localversion.bbclass b/classes/fsl-kernel-localversion.bbclass
index f7e0908fd..9ef0a62f6 100644
--- a/classes/fsl-kernel-localversion.bbclass
+++ b/classes/fsl-kernel-localversion.bbclass
@@ -25,8 +25,18 @@ do_kernel_localversion() {
 
         if [ "${SCMVERSION}" = "y" ]; then
                 # Add GIT revision to the local version
-                head=`git --git-dir=${S}/.git rev-parse --verify --short ${SRCREV} 2> /dev/null`
-                patches=`git --git-dir=${S}/.git rev-list --count ${SRCREV}..HEAD 2> /dev/null`
+                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
 
                 sed -i -e "/CONFIG_LOCALVERSION_AUTO[ =]/d" ${B}/.config
diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass
index d160ca985..94b30c04e 100644
--- a/classes/fsl-u-boot-localversion.bbclass
+++ b/classes/fsl-u-boot-localversion.bbclass
@@ -17,11 +17,21 @@ UBOOT_LOCALVERSION = "${LOCALVERSION}"
 do_compile:prepend() {
         if [ "${SCMVERSION}" = "y" ]; then
                 # Add GIT revision to the local version
-                head=`cd ${S} ; git rev-parse --verify --short ${SRCREV} 2> /dev/null`
-                patches=`cd ${S} ; git rev-list --count ${SRCREV}..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
+                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
                 printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
                 printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
         fi