* [PATCH 0/3] toaster: add master branch back in to releases
@ 2016-10-31 21:22 brian avery
2016-10-31 21:22 ` [PATCH 1/3] toaster: Update oe-core fixture for Morty plus master release brian avery
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: brian avery @ 2016-10-31 21:22 UTC (permalink / raw)
To: toaster; +Cc: brian avery
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
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/3] toaster: Update oe-core fixture for Morty plus master release
2016-10-31 21:22 [PATCH 0/3] toaster: add master branch back in to releases brian avery
@ 2016-10-31 21:22 ` brian avery
2016-10-31 21:22 ` [PATCH 2/3] " brian avery
2016-10-31 21:22 ` [PATCH 3/3] toaster: Update default release to master brian avery
2 siblings, 0 replies; 6+ messages in thread
From: brian avery @ 2016-10-31 21:22 UTC (permalink / raw)
To: toaster; +Cc: brian avery
Update the oe-core fixture to include the master and Morty
releases.
Signed-off-by: brian avery <brian.avery@intel.com>
---
lib/toaster/orm/fixtures/oe-core.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/lib/toaster/orm/fixtures/oe-core.xml b/lib/toaster/orm/fixtures/oe-core.xml
index a6c834f..3edb61b 100644
--- a/lib/toaster/orm/fixtures/oe-core.xml
+++ b/lib/toaster/orm/fixtures/oe-core.xml
@@ -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>
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] toaster: Update oe-core fixture for Morty plus master release
2016-10-31 21:22 [PATCH 0/3] toaster: add master branch back in to releases brian avery
2016-10-31 21:22 ` [PATCH 1/3] toaster: Update oe-core fixture for Morty plus master release brian avery
@ 2016-10-31 21:22 ` brian avery
2016-11-02 12:02 ` Michael Wood
2016-10-31 21:22 ` [PATCH 3/3] toaster: Update default release to master brian avery
2 siblings, 1 reply; 6+ messages in thread
From: brian avery @ 2016-10-31 21:22 UTC (permalink / raw)
To: toaster; +Cc: brian avery
Update the poky fixture to include the master and Morty
releases.
Signed-off-by: brian avery <brian.avery@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>
<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>
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/3] toaster: Update oe-core fixture for Morty plus master release
2016-10-31 21:22 ` [PATCH 2/3] " brian avery
@ 2016-11-02 12:02 ` Michael Wood
2016-11-02 14:47 ` Brian Avery
0 siblings, 1 reply; 6+ messages in thread
From: Michael Wood @ 2016-11-02 12:02 UTC (permalink / raw)
To: toaster
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@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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] toaster: Update oe-core fixture for Morty plus master release
2016-11-02 12:02 ` Michael Wood
@ 2016-11-02 14:47 ` Brian Avery
0 siblings, 0 replies; 6+ messages in thread
From: Brian Avery @ 2016-11-02 14:47 UTC (permalink / raw)
To: Michael Wood; +Cc: toaster
[-- Attachment #1: Type: text/plain, Size: 3637 bytes --]
whoops. ok.
On Wed, Nov 2, 2016 at 5:02 AM, Michael Wood <michael.g.wood@intel.com>
wrote:
> 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.
>
>
> 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@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.yoctop
>> roject.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).
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.
>
>
> <object model="orm.bitbakeversion" pk="1">
>> <field type="CharField" name="name">morty</field>
>> <field type="CharField" name="giturl">git://git.yoctop
>> roject.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!
>
> yep error.
>
> + <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.
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.
>
>
> Michael
>
>
> --
> _______________________________________________
> toaster mailing list
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster
>
[-- Attachment #2: Type: text/html, Size: 6367 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] toaster: Update default release to master
2016-10-31 21:22 [PATCH 0/3] toaster: add master branch back in to releases brian avery
2016-10-31 21:22 ` [PATCH 1/3] toaster: Update oe-core fixture for Morty plus master release brian avery
2016-10-31 21:22 ` [PATCH 2/3] " brian avery
@ 2016-10-31 21:22 ` brian avery
2 siblings, 0 replies; 6+ messages in thread
From: brian avery @ 2016-10-31 21:22 UTC (permalink / raw)
To: toaster; +Cc: brian avery
Set master to be the default release in toaster when creating
new projects.
Signed-off-by: brian avery <brian.avery@intel.com>
---
lib/toaster/orm/fixtures/settings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/toaster/orm/fixtures/settings.xml b/lib/toaster/orm/fixtures/settings.xml
index ee6a202..78c0fdc 100644
--- a/lib/toaster/orm/fixtures/settings.xml
+++ b/lib/toaster/orm/fixtures/settings.xml
@@ -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>
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-11-02 14:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-31 21:22 [PATCH 0/3] toaster: add master branch back in to releases brian avery
2016-10-31 21:22 ` [PATCH 1/3] toaster: Update oe-core fixture for Morty plus master release brian avery
2016-10-31 21:22 ` [PATCH 2/3] " brian avery
2016-11-02 12:02 ` Michael Wood
2016-11-02 14:47 ` Brian Avery
2016-10-31 21:22 ` [PATCH 3/3] toaster: Update default release to master brian avery
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.