]> code.ossystems Code Review - openembedded-core.git/commit
kernel-yocto: make sure git tags get dereferenced properly in do_patch()
authorJeff Wang <jeffrey.wang@mit.ll.edu>
Fri, 7 Nov 2014 14:45:32 +0000 (09:45 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 20 Dec 2014 11:24:04 +0000 (11:24 +0000)
commitf79c9334f670ed6fce86047fbadb817af8d4fe14
treedc35d38edc48cd8f22effbcbdc4f0d5384c101c6
parentd5451dda1b8cfbbe8b6a779b0cd9b1397ebf1a07
kernel-yocto: make sure git tags get dereferenced properly in do_patch()

Commit 92c1ece6c347030d48995a36f4c67861356e59d3 causes the test in do_patch()
in kernel-yocto.bbclass to fail if ${machine_srcrev} is an annotated tag. The
check is meant to ensure that ${machine_srcrev} is an ancestor of HEAD, but
if ${machine_srcrev} is a tag, then "$(git rev-parse --verify
${machine_srcrev})" evaluates to the SHA of the tag instead of what it's
pointing to.

Replacing "$(git rev-parse --verify ${machine_srcrev})" with "$(git rev-parse
--verify ${machine_srcrev}~0)" fixed the problem by finding the object pointed
to by the tag, and not the tag itself. This also works for commit IDs that
are not tags, hence is safe in a scenarios.

Jeff Wang <jeffrey.wang@ll.mit.edu>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
meta/classes/kernel-yocto.bbclass