kernel-yocto: set master branch to a defined SRCREV

To support custom repositories that set a SRCREV and that only have
a single master branch, do_validate_branches needs a special case
for 'master'. We can't delete and recreate the branch, since you
cannot delete the current branch, instead we must reset the branch
to the proper SRCREV.

(From OE-Core rev: de5bb5879fa3282c46dc1ede36af34eaab8f647f)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 9 insertions, 5 deletions

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 1b37dc781a..4328093778 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -273,11 +273,15 @@ do_validate_branches() {
         # SRCREV (if it isn't the current HEAD of that branch)
         git checkout -q master
         for b in $containing_branches; do
-                branch_head=`git show-ref -s --heads ${b}`
+                branch_head=`git show-ref -s --heads ${b}`              
                 if [ "$branch_head" != "$target_branch_head" ]; then
-                        echo "[INFO] Setting branch $b to ${target_branch_head}"              
-                        git branch -D $b > /dev/null
-                        git branch $b $target_branch_head > /dev/null
+                        echo "[INFO] Setting branch $b to ${target_branch_head}"
+                        if [ "$b" == "master" ]; then
+                                git reset --hard $target_branch_head > /dev/null
+                        else
+                                git branch -D $b > /dev/null
+                                git branch $b $target_branch_head > /dev/null
+                        fi
                 fi
         done
 
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 974b86e372..0ff8b193f0 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "33068f21169b327c64ac7e957fe9d89c391897a3"
+SRCREV = "7d936da57db11f1114f3860e4fcc15221e796275"
 PR = "r12"
 PV = "0.1+git${SRCPV}"