sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Bruce Ashfield 2011-05-16 11:42:28 -04:00 committed by Richard Purdie
parent 7a0d252635
commit afe43ed090
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta/classes/kernel-yocto.bbclass
View File

@ -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}"

2
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
View File

@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
DEPENDS = "git-native guilt-native"
SRCREV = "ecbdf3cdf6705a63dcb3c50bb24c311046f0b35c"
SRCREV = "f8eb067b023d590b6cd8deddf6f96d6a820997af"
PR = r10
PV = "0.1+git${SRCPV}"