summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-05-16 11:42:28 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 15:14:43 +0100
commitafe43ed09086ea1497c88e07c90bff9fecb59ce8 (patch)
tree011e6e459292fac3767075f1f3e39cb8dc36232c /meta
parent7a0d252635a348cde789f1802474fa1b644a8fcf (diff)
downloadpoky-afe43ed09086ea1497c88e07c90bff9fecb59ce8.tar.gz
linux-yocto: detect and avoid branch revision checking for AUTOREV
When a BSP or layer specifies an AUTOREV for SRCREV, the logic that matches expected vs real branch heads doesn't apply. We always want the latest. To solve the issues with invalid git revs causing validation failures, we detect the AUTOINC value and do a early return, skipping validation. (From OE-Core rev: b4f1845f7cf42059984112e3f41a323b4c9d6dfd) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-yocto.bbclass7
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
2 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 818a07e219..536434fdf1 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -136,6 +136,13 @@ do_validate_branches() {
136 return 136 return
137 fi 137 fi
138 138
139 # nothing to do if SRCREV=${AUTOREV}
140 if [ "${SRCREV_machine}" = "AUTOINC" ]; then
141 # restore the branch for builds
142 git checkout -f ${KBRANCH}
143 return
144 fi
145
139 branch_head=`git show-ref -s --heads ${KBRANCH}` 146 branch_head=`git show-ref -s --heads ${KBRANCH}`
140 meta_head=`git show-ref -s --heads ${KMETA}` 147 meta_head=`git show-ref -s --heads ${KMETA}`
141 target_branch_head="${SRCREV_machine}" 148 target_branch_head="${SRCREV_machine}"
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 829d105d2c..f7600ca5b6 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=e2bf4415f3d8
4 4
5DEPENDS = "git-native guilt-native" 5DEPENDS = "git-native guilt-native"
6 6
7SRCREV = "ecbdf3cdf6705a63dcb3c50bb24c311046f0b35c" 7SRCREV = "f8eb067b023d590b6cd8deddf6f96d6a820997af"
8PR = r10 8PR = r10
9PV = "0.1+git${SRCPV}" 9PV = "0.1+git${SRCPV}"
10 10