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

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

[David Reyna]

From: David Reyna <David.Reyna@windriver.com>

For the Thud release, this is to fix a broken bitbake vertion pointer for the thud branch.

The following changes since commit cdd4a52578f4f1b79b3fc2c92aa4434b99efd91c:

  core-image-sato-sdk-ptest: Tweak size to stay within 4GB limit (2019-05-22 00:31:49 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib dreyna/toaster/thud_bitbake_2_6_13356
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dreyna/toaster/thud_bitbake_2_6_13356

David Reyna (1):
  toaster: Fix Thud Bitbake release for YP-2.6

 lib/toaster/orm/fixtures/oe-core.xml | 2 +-
 lib/toaster/orm/fixtures/poky.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
1.9.1

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

[David Reyna]

From: David Reyna <David.Reyna@windriver.com>

Fix the Bitbake version ID for Thud (1.40).

[YOCTO #13356]

Signed-off-by: David Reyna <David.Reyna@windriver.com>
---
 lib/toaster/orm/fixtures/oe-core.xml | 2 +-
 lib/toaster/orm/fixtures/poky.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/toaster/orm/fixtures/oe-core.xml b/lib/toaster/orm/fixtures/oe-core.xml
index a37c664..3ed234c 100644
--- a/lib/toaster/orm/fixtures/oe-core.xml
+++ b/lib/toaster/orm/fixtures/oe-core.xml
@@ -53,7 +53,7 @@
   <object model="orm.release" pk="4">
     <field type="CharField" name="name">thud</field>
     <field type="CharField" name="description">Openembedded Thud</field>
-    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
+    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
     <field type="CharField" name="branch_name">thud</field>
     <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=thud\"&gt;OpenEmbedded Thud&lt;/a&gt; branch.</field>
   </object>
diff --git a/lib/toaster/orm/fixtures/poky.xml b/lib/toaster/orm/fixtures/poky.xml
index 482efaf..80b7ef5 100644
--- a/lib/toaster/orm/fixtures/poky.xml
+++ b/lib/toaster/orm/fixtures/poky.xml
@@ -58,7 +58,7 @@
   <object model="orm.release" pk="4">
     <field type="CharField" name="name">thud</field>
     <field type="CharField" name="description">Yocto Project 2.6 "Thud"</field>
-    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
+    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
     <field type="CharField" name="branch_name">thud</field>
     <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=thud"&gt;Yocto Project Thud branch&lt;/a&gt;.</field>
   </object>
-- 
1.9.1

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

[Richard Purdie]

On Sun, 2019-06-09 at 17:44 -0700, David Reyna wrote:
> From: David Reyna <David.Reyna@windriver.com>
> 
> Fix the Bitbake version ID for Thud (1.40).
> 
> [YOCTO #13356]
> 
> Signed-off-by: David Reyna <David.Reyna@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

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

[Reyna, David]

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@linuxfoundation.org] 
Sent: Monday, June 10, 2019 1:47 AM
To: Reyna, David; bitbake-devel@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@windriver.com>
> 
> Fix the Bitbake version ID for Thud (1.40).
> 
> [YOCTO #13356]
> 
> Signed-off-by: David Reyna <David.Reyna@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

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

[richard.purdie]

On Tue, 2019-06-11 at 08:24 +0000, Reyna, David wrote:
> 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.

That won't happen for another few months so I wanted to ensure anyone
using master sees the bug fix and doesn't run into the problem.

> > ... 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!

Great, thanks!

Richard