toaster: Update oe-core fixture for Morty plus master release
PATCH 1/3 toaster: Update oe-core fixture for Morty plus master release
Update the oe-core fixture to include the master and Morty releases.
--- lib/toaster/orm/fixtures/oe-core.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+)
lib/toaster/orm/fixtures/oe-core.xml +12 -0
@@ -7,6 +7,11 @@ </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.openembedded.org/bitbake</field> + <field type="CharField" name="branch">master</field> + </object> <object model="orm.bitbakeversion" pk="1"> <field type="CharField" name="name">morty</field> <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
@@ -17,6 +22,13 @@ </object> <!-- Releases available --> + <object model="orm.release" pk="3"> + <field type="CharField" name="name">master</field> + <field type="CharField" name="description">Openembedded Master</field> + <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">3</field> + <field type="CharField" name="branch_name">master</field> + <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=morty\">OpenEmbedded master</a> branch, 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">Openembedded Morty</field>
Signature · 1 line
1.9.1
PATCH 2/3 toaster: Update oe-core fixture for Morty plus master release
Update the poky fixture to include the master and Morty releases.
--- lib/toaster/orm/fixtures/poky.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+)
lib/toaster/orm/fixtures/poky.xml +13 -0
@@ -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> <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> + <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>
Signature · 1 line
1.9.1
This commit subject line does not match the content of this patch. I think you've accidentally duplicated it from the first patch.
Quoted 13 lines · brian avery
Update the poky fixture to include the master and Morty releases.
Signed-off-by brian avery <[email protected]>--- lib/toaster/orm/fixtures/poky.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+)lib/toaster/orm/fixtures/poky.xml +0
-0
lib/toaster/orm/fixtures/poky.xml line 15
Quoted 9 lines
lib/toaster/orm/fixtures/poky.xml +6
-0@@ -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).
lib/toaster/orm/fixtures/poky.xml line 34
Quoted 12 lines
lib/toaster/orm/fixtures/poky.xml +5
-0<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!
lib/toaster/orm/fixtures/poky.xml line 39
Quoted 5 lines
lib/toaster/orm/fixtures/poky.xml +2
-0+ <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
whoops. ok.
Quoted 2 lines · Michael Wood
This commit subject line does not match the content of this patch. I think you've accidentally duplicated it from the first patch.
kind of. I should have made the subject more general since this was a patch set to do both of them.
Quoted 23 lines · brian avery
Quoted 20 lines
Update the poky fixture to include the master and Morty releases.
Signed-off-by brian avery <[email protected]>--- lib/toaster/orm/fixtures/poky.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+)lib/toaster/orm/fixtures/poky.xml +3
-0@@ -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.yoctop
Quoted 8 lines
lib/toaster/orm/fixtures/poky.xml line 15
Quoted 5 lines
roject.org/poky</field>
lib/toaster/orm/fixtures/poky.xml +3
-0+ <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).
I found the out of order thing made it clearer to me that the order isn't what determinies the default. Maybe we should order then correctly and add a comment about settings.xml for default.
Quoted 37 lines
<object model="orm.bitbakeversion" pk="1">
Quoted 9 lines
<field type="CharField" name="name">morty</field> <field type="CharField" name="giturl">git://git.yoctop
roject.org/poky</field>lib/toaster/orm/fixtures/poky.xml +3
-0@@ -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 ProjectQuoted 5 lines
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_nameset to "morty" this won't work!yep error.
+ <field type="TextField" name="helptext">Toaster will run your builds
Quoted 10 lines
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>
Quoted 5 lines
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.
I'd forgotten about the layer issue. Sadly while this is unresolved we cannot update the master toaster containers.
k, I'll leave it with you.
-b
an intel employee.
Quoted 11 lines
Michael
--
_______________________________________________
toaster mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/toaster
PATCH 3/3 toaster: Update default release to master
In reply to brian averySet master to be the default release in toaster when creating new projects.
--- lib/toaster/orm/fixtures/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/toaster/orm/fixtures/settings.xml +1 -1
@@ -4,7 +4,7 @@ <!-- pk=1 is DISTRO --> <object model="orm.toastersetting" pk="2"> <field type="CharField" name="name">DEFAULT_RELEASE</field> - <field type="CharField" name="value">morty</field> + <field type="CharField" name="value">master</field> </object> <object model="orm.toastersetting" pk="3"> <field type="CharField" name="name">DEFCONF_PACKAGE_CLASSES</field>
Signature · 1 line
1.9.1
cover toaster: add master branch back in to releases
For the morty release we removed master so it couldn't be chosen from the "new project" settings. Now that the bitbake version of 1.32 has been fixed for Morty, we can add the maaster release back into the fixtures.
This is being done for poky and oe-core. They will both default to master on the master branch.
-Brian
an intel employee
The following changes since commit 003b053498aea91fdb8c5418d0d8bbda7b23dbc0:
boost: fix the SRC_URI to point to an actual release, and not a master snapshot (2016-10-31 14:23:12 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib bavery/toaster/addbackMasterRelease
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=bavery/toaster/addbackMasterRelease
brian avery (3):
toaster: Update oe-core fixture for Morty plus master release
toaster: Update oe-core fixture for Morty plus master release
toaster: Update default release to master
lib/toaster/orm/fixtures/oe-core.xml | 12 ++++++++++++ lib/toaster/orm/fixtures/poky.xml | 13 +++++++++++++ lib/toaster/orm/fixtures/settings.xml | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-)
--
1.9.1