diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-05-16 11:42:28 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-17 15:14:43 +0100 |
| commit | afe43ed09086ea1497c88e07c90bff9fecb59ce8 (patch) | |
| tree | 011e6e459292fac3767075f1f3e39cb8dc36232c /meta/classes/kernel-yocto.bbclass | |
| parent | 7a0d252635a348cde789f1802474fa1b644a8fcf (diff) | |
| download | openembedded-core-contrib-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/classes/kernel-yocto.bbclass')
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 7 |
1 files changed, 7 insertions, 0 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() { return fi + # nothing to do if SRCREV=${AUTOREV} + if [ "${SRCREV_machine}" = "AUTOINC" ]; then + # restore the branch for builds + git checkout -f ${KBRANCH} + return + fi + branch_head=`git show-ref -s --heads ${KBRANCH}` meta_head=`git show-ref -s --heads ${KMETA}` target_branch_head="${SRCREV_machine}" |