summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-10-12 23:53:59 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-24 17:36:17 +0100
commit11dafe84473a1197931f068e1c6e002bc461cefd (patch)
treeb5dfd98cc610b76071b0e33b348c970284923764 /meta/classes
parent2f93628290ffedc4dd2c80e4c579574519b717dd (diff)
downloadpoky-11dafe84473a1197931f068e1c6e002bc461cefd.tar.gz
kernel-yocto: fix branch validation for AUTOREV, non machine_meta kernels
The simplication of do_validate_branches missed a case where a custom kernel can supply SRCREV="${AUTOREV}", and not use SRCREV_machine at all. In this case, we will incorrectly try and test the tree for a non-existent commit, and break the build. By simplying the condition of the check to look for an empty SRCREV_machine, we can skip manipulating the tree and testing for a SRCREV. (From OE-Core rev: 212a4bd9b086365c022842a2ac6a2a25bd486002) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel-yocto.bbclass14
1 files changed, 8 insertions, 6 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 7718f9ab1b..e672a0e3a5 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -288,12 +288,14 @@ do_validate_branches() {
288 # check and we can exit early 288 # check and we can exit early
289 if [ "${machine_srcrev}" = "AUTOINC" ]; then 289 if [ "${machine_srcrev}" = "AUTOINC" ]; then
290 bbnote "SRCREV validation is not required for AUTOREV" 290 bbnote "SRCREV validation is not required for AUTOREV"
291 elif [ "${machine_srcrev}" = "" ] && [ "${SRCREV}" != "AUTOINC" ]; then 291 elif [ "${machine_srcrev}" = "" ]; then
292 # SRCREV_machine_<MACHINE> was not set. This means that a custom recipe 292 if [ "${SRCREV}" != "AUTOINC" ]; then
293 # that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In 293 # SRCREV_machine_<MACHINE> was not set. This means that a custom recipe
294 # this case, we need to reset to the give SRCREV before heading to patching 294 # that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In
295 bbnote "custom recipe is being built, forcing SRCREV to ${SRCREV}" 295 # this case, we need to reset to the give SRCREV before heading to patching
296 force_srcrev="${SRCREV}" 296 bbnote "custom recipe is being built, forcing SRCREV to ${SRCREV}"
297 force_srcrev="${SRCREV}"
298 fi
297 else 299 else
298 git cat-file -t ${machine_srcrev} > /dev/null 300 git cat-file -t ${machine_srcrev} > /dev/null
299 if [ $? -ne 0 ]; then 301 if [ $? -ne 0 ]; then