diff options
author | Jeff Wang <jeffrey.wang@mit.ll.edu> | 2014-11-07 09:45:32 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-20 11:24:04 +0000 |
commit | f79c9334f670ed6fce86047fbadb817af8d4fe14 (patch) | |
tree | dc35d38edc48cd8f22effbcbdc4f0d5384c101c6 /meta/classes/gsettings.bbclass | |
parent | d5451dda1b8cfbbe8b6a779b0cd9b1397ebf1a07 (diff) | |
download | openembedded-core-f79c9334f670ed6fce86047fbadb817af8d4fe14.tar.gz openembedded-core-f79c9334f670ed6fce86047fbadb817af8d4fe14.tar.bz2 openembedded-core-f79c9334f670ed6fce86047fbadb817af8d4fe14.zip |
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>
Diffstat (limited to 'meta/classes/gsettings.bbclass')
0 files changed, 0 insertions, 0 deletions