Test in do_patch() fails for annotated tags

Test in do_patch() fails for annotated tags

[Jeff Wang]

[-- Attachment #1: Type: text/plain, Size: 602 bytes --]

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)" seems to fix the problem. See 
http://stackoverflow.com/a/1863712/1454667

-- 
Jeff Wang



[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 3145 bytes --]

Re: Test in do_patch() fails for annotated tags

[Bruce Ashfield]

Jeff and I have already exchanged email on this yesterday. While using a tag
for the SRCREV is not typically something we suggest .. tweaking the
ancestor check is fine in this case, since it works in both scenarios.

I have a patch queued to address this, and am soaking it now.

Bruce

On Thu, Nov 6, 2014 at 6:12 PM, Jeff Wang <jeffrey.wang@ll.mit.edu> wrote:
> 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)" seems to fix the problem. See
> http://stackoverflow.com/a/1863712/1454667
>
> --
> Jeff Wang
>
>
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"