[PATCH 0/3] [Morty] toaster:update fixtures for morty release

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 0/3] [Morty] toaster:update fixtures for morty release
@ 2016-10-14  1:12 brian avery
  2016-10-14  1:12 ` [PATCH 1/3] toaster: Update oe-core fixture for Morty release brian avery
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: brian avery @ 2016-10-14  1:12 UTC (permalink / raw)
  To: toaster; +Cc: brian avery

This changes the fixtures for toaster in Morty so that
1) We only allow the morty branch for new projects
2) we default to morty when making a new project.

This release we do not support building older releases due to
the Python 2.7 -> Python 3 change Morty represents.

This patch set updates both the poky and oe-core fixtures.

Note: this only applies to the Morty branch and should *not* be applied to
master.

-bavery


The following changes since commit 1a95d4a0701b87ae3674239a01aabe38a0123585:

  bitbake: bitbake-user-manual: Changed BB_SETSCENE_VERIFY_FUNCTION name (2016-10-13 23:29:25 +0100)

are available in the git repository at:

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

brian avery (3):
  toaster: Update oe-core fixture for Morty release
  toaster: Update poky fixture for Morty release
  toaster: Update default release to Morty

 bitbake/lib/toaster/orm/fixtures/oe-core.xml  | 16 ++++++++--------
 bitbake/lib/toaster/orm/fixtures/poky.xml     | 12 ++++++------
 bitbake/lib/toaster/orm/fixtures/settings.xml |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

--
1.9.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/3] toaster: Update oe-core fixture for Morty release
  2016-10-14  1:12 [PATCH 0/3] [Morty] toaster:update fixtures for morty release brian avery
@ 2016-10-14  1:12 ` brian avery
  2016-10-14 10:36   ` Michael Wood
  2016-10-14  1:12 ` [PATCH 2/3] toaster: Update poky " brian avery
  2016-10-14  1:12 ` [PATCH 3/3] toaster: Update default release to Morty brian avery
  2 siblings, 1 reply; 6+ messages in thread
From: brian avery @ 2016-10-14  1:12 UTC (permalink / raw)
  To: toaster; +Cc: brian avery

Update the oe-core fixture to the Morty release.  This removes the
master branch from the release and limits it to the morty branch.
Normally, we would also support at least one past branch but the change
from Python 2.7 -> Python 3 makes that infeasible.

Signed-off-by: brian avery <brian.avery@intel.com>
---
 bitbake/lib/toaster/orm/fixtures/oe-core.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
index d062de5..4ec8e39 100644
--- a/bitbake/lib/toaster/orm/fixtures/oe-core.xml
+++ b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
@@ -8,9 +8,9 @@
 
   <!-- Bitbake versions which correspond to the metadata release -->
   <object model="orm.bitbakeversion" pk="1">
-    <field type="CharField" name="name">master</field>
+    <field type="CharField" name="name">morty</field>
     <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
-    <field type="CharField" name="branch">master</field>
+    <field type="CharField" name="branch">morty</field>
   </object>
   <object model="orm.bitbakeversion" pk="2">
     <field type="CharField" name="name">HEAD</field>
@@ -18,11 +18,11 @@
 
   <!-- Releases available -->
   <object model="orm.release" pk="1">
-    <field type="CharField" name="name">master</field>
-    <field type="CharField" name="description">Openembedded master</field>
+    <field type="CharField" name="name">morty</field>
+    <field type="CharField" name="description">Openembedded Morty</field>
     <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
-    <field type="CharField" name="branch_name">master</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/\"&gt;OpenEmbedded master&lt;/a&gt; branch, where active development takes place. This is not a stable branch, so your builds might not work as expected.</field>
+    <field type="CharField" name="branch_name">morty</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=morty\"&gt;OpenEmbedded Morty&lt;/a&gt; branch.</field>
   </object>
   <object model="orm.release" pk="2">
     <field type="CharField" name="name">local</field>
@@ -41,12 +41,12 @@
     <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
     <field type="CharField" name="layer_name">openembedded-core</field>
   </object>
-  
+
   <!-- TYPE_LOCAL = 0 Layers for the Local release -->
   <object model="orm.layer" pk="1">
     <field type="CharField" name="name">openembedded-core</field>
     <field type="CharField" name="vcs_url">git://git.openembedded.org/openembedded-core</field>
-  </object> 
+  </object>
   <object model="orm.layer_version" pk="1">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/3] toaster: Update oe-core fixture for Morty release
  2016-10-14  1:12 ` [PATCH 1/3] toaster: Update oe-core fixture for Morty release brian avery
@ 2016-10-14 10:36   ` Michael Wood
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Wood @ 2016-10-14 10:36 UTC (permalink / raw)
  To: toaster

On 14/10/16 02:12, brian avery wrote:
> Update the oe-core fixture to the Morty release.  This removes the
> master branch from the release and limits it to the morty branch.
> Normally, we would also support at least one past branch but the change
> from Python 2.7 -> Python 3 makes that infeasible.
>
> Signed-off-by: brian avery <brian.avery@intel.com>
> ---
>   bitbake/lib/toaster/orm/fixtures/oe-core.xml | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
> index d062de5..4ec8e39 100644
> --- a/bitbake/lib/toaster/orm/fixtures/oe-core.xml
> +++ b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
> @@ -8,9 +8,9 @@
>   
>     <!-- Bitbake versions which correspond to the metadata release -->
>     <object model="orm.bitbakeversion" pk="1">
> -    <field type="CharField" name="name">master</field>
> +    <field type="CharField" name="name">morty</field>
>       <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
> -    <field type="CharField" name="branch">master</field>
> +    <field type="CharField" name="branch">morty</field>

I think this branch should be 1.32 nor "morty" for the branch as 
git://git.openembedded.org/bitbake doesn't use the same version names


>     </object>
>     <object model="orm.bitbakeversion" pk="2">
>       <field type="CharField" name="name">HEAD</field>
> @@ -18,11 +18,11 @@
>   
>     <!-- Releases available -->
>     <object model="orm.release" pk="1">
> -    <field type="CharField" name="name">master</field>
> -    <field type="CharField" name="description">Openembedded master</field>
> +    <field type="CharField" name="name">morty</field>
> +    <field type="CharField" name="description">Openembedded Morty</field>
>       <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
> -    <field type="CharField" name="branch_name">master</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/\"&gt;OpenEmbedded master&lt;/a&gt; branch, where active development takes place. This is not a stable branch, so your builds might not work as expected.</field>
> +    <field type="CharField" name="branch_name">morty</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=morty\"&gt;OpenEmbedded Morty&lt;/a&gt; branch.</field>
>     </object>
>     <object model="orm.release" pk="2">
>       <field type="CharField" name="name">local</field>
> @@ -41,12 +41,12 @@
>       <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
>       <field type="CharField" name="layer_name">openembedded-core</field>
>     </object>
> -
> +
>     <!-- TYPE_LOCAL = 0 Layers for the Local release -->
>     <object model="orm.layer" pk="1">
>       <field type="CharField" name="name">openembedded-core</field>
>       <field type="CharField" name="vcs_url">git://git.openembedded.org/openembedded-core</field>
> -  </object>
> +  </object>
>     <object model="orm.layer_version" pk="1">
>       <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
>       <field rel="ManyToOneRel" to="orm.release" name="release">2</field>




^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 2/3] toaster: Update poky fixture for Morty release
  2016-10-14  1:12 [PATCH 0/3] [Morty] toaster:update fixtures for morty release brian avery
  2016-10-14  1:12 ` [PATCH 1/3] toaster: Update oe-core fixture for Morty release brian avery
@ 2016-10-14  1:12 ` brian avery
  2016-10-14  1:12 ` [PATCH 3/3] toaster: Update default release to Morty brian avery
  2 siblings, 0 replies; 6+ messages in thread
From: brian avery @ 2016-10-14  1:12 UTC (permalink / raw)
  To: toaster; +Cc: brian avery

Update the poky fixture to the Morty release.  This removes the
master branch from the release and limits it to the morty branch.
Normally, we would also support at least one past branch but the change
from Python 2.7 -> Python 3 makes that infeasible.

Signed-off-by: brian avery <brian.avery@intel.com>
---
 bitbake/lib/toaster/orm/fixtures/poky.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bitbake/lib/toaster/orm/fixtures/poky.xml b/bitbake/lib/toaster/orm/fixtures/poky.xml
index 75a2916..5a08fd4 100644
--- a/bitbake/lib/toaster/orm/fixtures/poky.xml
+++ b/bitbake/lib/toaster/orm/fixtures/poky.xml
@@ -8,9 +8,9 @@
 
   <!-- Bitbake versions which correspond to the metadata release -->
   <object model="orm.bitbakeversion" pk="1">
-    <field type="CharField" name="name">master</field>
+    <field type="CharField" name="name">morty</field>
     <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
-    <field type="CharField" name="branch">master</field>
+    <field type="CharField" name="branch">morty</field>
     <field type="CharField" name="dirpath">bitbake</field>
   </object>
   <object model="orm.bitbakeversion" pk="2">
@@ -22,11 +22,11 @@
 
   <!-- Releases available -->
   <object model="orm.release" pk="1">
-    <field type="CharField" name="name">master</field>
-    <field type="CharField" name="description">Yocto Project master</field>
+    <field type="CharField" name="name">morty</field>
+    <field type="CharField" name="description">Yocto Project Morty</field>
     <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
-    <field type="CharField" name="branch_name">master</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/"&gt;Yocto Project master branch&lt;/a&gt;, where active development takes place. This is not a stable branch, so your builds might not work as expected.</field>
+    <field type="CharField" name="branch_name">morty</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=morty"&gt;Yocto Project Morty branch&lt;/a&gt;.</field>
   </object>
   <object model="orm.release" pk="2">
     <field type="CharField" name="name">local</field>
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/3] toaster: Update default release to Morty
  2016-10-14  1:12 [PATCH 0/3] [Morty] toaster:update fixtures for morty release brian avery
  2016-10-14  1:12 ` [PATCH 1/3] toaster: Update oe-core fixture for Morty release brian avery
  2016-10-14  1:12 ` [PATCH 2/3] toaster: Update poky " brian avery
@ 2016-10-14  1:12 ` brian avery
  2016-10-14 15:29   ` Michael Wood
  2 siblings, 1 reply; 6+ messages in thread
From: brian avery @ 2016-10-14  1:12 UTC (permalink / raw)
  To: toaster; +Cc: brian avery

Set Morty to be the default release in toaster for the Morty release
when creating new projects.

Signed-off-by: brian avery <brian.avery@intel.com>
---
 bitbake/lib/toaster/orm/fixtures/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bitbake/lib/toaster/orm/fixtures/settings.xml b/bitbake/lib/toaster/orm/fixtures/settings.xml
index 78c0fdc..ee6a202 100644
--- a/bitbake/lib/toaster/orm/fixtures/settings.xml
+++ b/bitbake/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">master</field>
+    <field type="CharField" name="value">morty</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

* Re: [PATCH 3/3] toaster: Update default release to Morty
  2016-10-14  1:12 ` [PATCH 3/3] toaster: Update default release to Morty brian avery
@ 2016-10-14 15:29   ` Michael Wood
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Wood @ 2016-10-14 15:29 UTC (permalink / raw)
  To: toaster

Sent upstream to bitbake-devel with:

- Fix branch name in oe-core for bitbake
- Add "2.2" as part of the description

Thanks,

Michael

On 14/10/16 02:12, brian avery wrote:
> Set Morty to be the default release in toaster for the Morty release
> when creating new projects.
>
> Signed-off-by: brian avery <brian.avery@intel.com>
> ---
>   bitbake/lib/toaster/orm/fixtures/settings.xml | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/bitbake/lib/toaster/orm/fixtures/settings.xml b/bitbake/lib/toaster/orm/fixtures/settings.xml
> index 78c0fdc..ee6a202 100644
> --- a/bitbake/lib/toaster/orm/fixtures/settings.xml
> +++ b/bitbake/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">master</field>
> +    <field type="CharField" name="value">morty</field>
>     </object>
>     <object model="orm.toastersetting" pk="3">
>       <field type="CharField" name="name">DEFCONF_PACKAGE_CLASSES</field>




^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-10-14 15:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-14  1:12 [PATCH 0/3] [Morty] toaster:update fixtures for morty release brian avery
2016-10-14  1:12 ` [PATCH 1/3] toaster: Update oe-core fixture for Morty release brian avery
2016-10-14 10:36   ` Michael Wood
2016-10-14  1:12 ` [PATCH 2/3] toaster: Update poky " brian avery
2016-10-14  1:12 ` [PATCH 3/3] toaster: Update default release to Morty brian avery
2016-10-14 15:29   ` Michael Wood

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.