Re: [Toaster] [PATCH 1/3] toaster: Update oe-core fixture for Morty release

[Michael Wood]

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.av...@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>


--
_______________________________________________
toaster mailing list
toaster@yoctoproject.org
https://lists.yoctoproject.org/listinfo/toaster