[bitbake-devel] [PATCH 1/1] [THUD] toaster: Fix Thud Bitbake release for YP-2.6

Reyna, David david.reyna at windriver.com
Tue Jun 11 08:24:51 UTC 2019


Hi Richard,

> When we fix an issue like this we really need to fix it on master first...

I was actually not going to fix master because "Thud" disappears from these files and gets replaced by "Zeus" when master finally becomes "Zeus", but I understand your point.

> ... then backported it to the 1.42 and 1.40 branches with a straightforward cherry-pick.

That should work. The affected files are slightly different nearby, but since the cherry pick worked those differences are fortunately outside the fuzz zone, so all is good.

> Can you check I've got the right changes in please?

Yes they are!

- David

-----Original Message-----
From: Richard Purdie [mailto:richard.purdie at linuxfoundation.org] 
Sent: Monday, June 10, 2019 1:47 AM
To: Reyna, David; bitbake-devel at lists.openembedded.org
Subject: Re: [bitbake-devel] [PATCH 1/1] [THUD] toaster: Fix Thud Bitbake release for YP-2.6

On Sun, 2019-06-09 at 17:44 -0700, David Reyna wrote:
> From: David Reyna <David.Reyna at windriver.com>
> 
> Fix the Bitbake version ID for Thud (1.40).
> 
> [YOCTO #13356]
> 
> Signed-off-by: David Reyna <David.Reyna at windriver.com>
> ---
>  lib/toaster/orm/fixtures/oe-core.xml | 2 +-
>  lib/toaster/orm/fixtures/poky.xml    | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Thanks for these David.

When we fix an issue like this we really need to fix it on master
first, then backport the fix to the warrior and then thud branches.

In this case I've applied the fix to master (with some teaks to the
commit message), then backported it to the 1.42 and 1.40 branches with
a straightforward cherry-pick.

Can you check I've got the right changes in please?

Cheers,

Richard



More information about the bitbake-devel mailing list