[Toaster] [PATCH 2/3] toaster: Update oe-core fixture for Morty plus master release

Michael Wood michael.g.wood at intel.com
Wed Nov 2 05:02:04 PDT 2016


This commit subject line does not match the content of this patch. I 
think you've accidentally duplicated it from the first patch.

On 31/10/16 21:22, brian avery wrote:
> Update the poky fixture to include the master and Morty
> releases.
>
> Signed-off-by: brian avery <brian.avery at intel.com>
> ---
>   lib/toaster/orm/fixtures/poky.xml | 13 +++++++++++++
>   1 file changed, 13 insertions(+)
>
> diff --git a/lib/toaster/orm/fixtures/poky.xml b/lib/toaster/orm/fixtures/poky.xml
> index c192baa..8324071 100644
> --- a/lib/toaster/orm/fixtures/poky.xml
> +++ b/lib/toaster/orm/fixtures/poky.xml
> @@ -7,6 +7,12 @@
>     </object>
>   
>     <!-- Bitbake versions which correspond to the metadata release -->
> +  <object model="orm.bitbakeversion" pk="3">
> +    <field type="CharField" name="name">master</field>
> +    <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
> +    <field type="CharField" name="branch">master</field>
> +    <field type="CharField" name="dirpath">bitbake</field>
> +  </object>

It's a small thing but please also order the objects in the fixtures 
sequentially (rather than 3 .. 1.. 2).

>     <object model="orm.bitbakeversion" pk="1">
>       <field type="CharField" name="name">morty</field>
>       <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
> @@ -21,6 +27,13 @@
>     </object>
>   
>     <!-- Releases available -->
> +  <object model="orm.release" pk="3">
> +    <field type="CharField" name="name">master</field>
> +    <field type="CharField" name="description">Yocto Project master</field>
> +    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">3</field>
> +    <field type="CharField" name="branch_name">morty</field>

Release master but you've got the branch_name set to "morty" this won't 
work!


> +    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/">Yocto Project master branch</a>, where active development takes place. This is not a stable branch, so your builds might not work as expected.</field>
> +  </object>
>     <object model="orm.release" pk="1">
>       <field type="CharField" name="name">morty</field>
>       <field type="CharField" name="description">Yocto Project 2.2 "Morty"</field>

As mentioned on the Toaster call last week I've already had a go at 
doing these patches already. See 
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10497 and the 
attachment. This bug is unresolved, when you create a new project it 
won't pick up the correct default layers, your patches also don't 
address this issue.

Michael



More information about the toaster mailing list