summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-08-22 01:18:05 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-25 14:47:00 +0100
commit01ce721684566e5c8a668b73ba73d4837c4649a2 (patch)
tree55570a635fc06d0d7a6bac9d08677f49cd9920a1
parent9a1705ef805b0b5a8e8bf2986a521bf5f29e4556 (diff)
downloadpoky-01ce721684566e5c8a668b73ba73d4837c4649a2.tar.gz
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>
-rw-r--r--meta/classes/kernel-yocto.bbclass12
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
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() {
273 # SRCREV (if it isn't the current HEAD of that branch) 273 # SRCREV (if it isn't the current HEAD of that branch)
274 git checkout -q master 274 git checkout -q master
275 for b in $containing_branches; do 275 for b in $containing_branches; do
276 branch_head=`git show-ref -s --heads ${b}` 276 branch_head=`git show-ref -s --heads ${b}`
277 if [ "$branch_head" != "$target_branch_head" ]; then 277 if [ "$branch_head" != "$target_branch_head" ]; then
278 echo "[INFO] Setting branch $b to ${target_branch_head}" 278 echo "[INFO] Setting branch $b to ${target_branch_head}"
279 git branch -D $b > /dev/null 279 if [ "$b" == "master" ]; then
280 git branch $b $target_branch_head > /dev/null 280 git reset --hard $target_branch_head > /dev/null
281 else
282 git branch -D $b > /dev/null
283 git branch $b $target_branch_head > /dev/null
284 fi
281 fi 285 fi
282 done 286 done
283 287
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
4 4
5DEPENDS = "git-native guilt-native" 5DEPENDS = "git-native guilt-native"
6 6
7SRCREV = "33068f21169b327c64ac7e957fe9d89c391897a3" 7SRCREV = "7d936da57db11f1114f3860e4fcc15221e796275"
8PR = "r12" 8PR = "r12"
9PV = "0.1+git${SRCPV}" 9PV = "0.1+git${SRCPV}"
10 10