[poky] [PATCH] kernel-yocto.bbclass: Bug Fix inside do_kernel_checkout()

Bruce Ashfield bruce.ashfield at gmail.com
Thu Jan 15 13:13:42 PST 2015


This change should go to the oe-core devel list
(openembedded-core at lists.openembedded.org)

On Thu, Jan 15, 2015 at 12:47 PM, Theodor Gherzan <theodor at resin.io> wrote:
>  After we check the existence of 'machine_branch' with 'git show-ref'
>  the following if statement should change the 'machine_branch'
>  to the default (i.e. master) if the 'git show-ref' has returned an
>  exit code that is not 0, not the other way around.

I was actually looking to remove the block completely .. in the end, this code
doesn't care about the branch anymore (it used to), it is the git checkout -f
that is the important operation.

.. but indeed, the condition is inverted .. good catch!

Bruce



>
>  Signed-off-by: Theodor Gherzan <theodor at resin.io>
>
> diff --git a/meta/classes/kernel-yocto.bbclass
> b/meta/classes/kernel-yocto.bbclass
> index 3b59d85..44aa1b8 100644
> --- a/meta/classes/kernel-yocto.bbclass
> +++ b/meta/classes/kernel-yocto.bbclass
> @@ -211,7 +211,7 @@ do_kernel_checkout() {
>         # Create a working tree copy of the kernel by checking out a branch
>         machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
>         git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
> -       if [ $? -eq 0 ]; then
> +       if [ $? -ne 0 ]; then
>                 machine_branch="master"
>         fi
>
> --
> _______________________________________________
> poky mailing list
> poky at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>



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


More information about the poky mailing list