Add the master release option to base your project on and correct the morty release so that for poky based setups we use the poky provided version of the layer rather than checking out the layer from its own git repository.
[YOCTO #10497] Signed-off-by: Michael Wood <[email protected]> --- bitbake/lib/toaster/orm/fixtures/oe-core.xml | 23 +++++++- bitbake/lib/toaster/orm/fixtures/poky.xml | 82 +++++++++++++++++++++++++--- 2 files changed, 96 insertions(+), 9 deletions(-) diff --git a/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/bitbake/lib/toaster/orm/fixtures/oe-core.xml index a6c834f..4d3d185 100644 --- a/bitbake/lib/toaster/orm/fixtures/oe-core.xml +++ b/bitbake/lib/toaster/orm/fixtures/oe-core.xml @@ -14,6 +14,13 @@ </object> <object model="orm.bitbakeversion" pk="2"> <field type="CharField" name="name">HEAD</field> + <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> + <field type="CharField" name="branch">HEAD</field> + </object> + <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> <!-- Releases available --> @@ -31,18 +38,30 @@ <field type="CharField" name="branch_name">HEAD</field> <field type="TextField" name="helptext">Toaster will run your builds with the version of OpenEmbedded that you have cloned or downloaded to your computer.</field> </object> + <object model="orm.release" pk="3"> + <field type="CharField" name="name">master</field> + <field type="CharField" name="description">OpenEmbedded core 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/\">OpenEmbedded master</a> branch.</field> + </object> <!-- Default layers for each release --> <object model="orm.releasedefaultlayer" pk="1"> <field rel="ManyToOneRel" to="orm.release" name="release">1</field> <field type="CharField" name="layer_name">openembedded-core</field> </object> - <object model="orm.releasedefaultlayer" pk="4"> + <object model="orm.releasedefaultlayer" pk="2"> <field rel="ManyToOneRel" to="orm.release" name="release">2</field> <field type="CharField" name="layer_name">openembedded-core</field> </object> + <object model="orm.releasedefaultlayer" pk="3"> + <field rel="ManyToOneRel" to="orm.release" name="release">3</field> + <field type="CharField" name="layer_name">openembedded-core</field> + </object> + - <!-- TYPE_LOCAL = 0 Layers for the Local release --> + <!-- Layer 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> diff --git a/bitbake/lib/toaster/orm/fixtures/poky.xml b/bitbake/lib/toaster/orm/fixtures/poky.xml index c192baa..dcc7aaf 100644 --- a/bitbake/lib/toaster/orm/fixtures/poky.xml +++ b/bitbake/lib/toaster/orm/fixtures/poky.xml @@ -19,6 +19,13 @@ <field type="CharField" name="branch">HEAD</field> <field type="CharField" name="dirpath">bitbake</field> </object> + <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> + <!-- Releases available --> <object model="orm.release" pk="1"> @@ -35,8 +42,15 @@ <field type="CharField" name="branch_name">HEAD</field> <field type="TextField" name="helptext">Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer.</field> </object> + <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">master</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>.</field> + </object> - <!-- Default layers for each release --> + <!-- Default project layers for each release --> <object model="orm.releasedefaultlayer" pk="1"> <field rel="ManyToOneRel" to="orm.release" name="release">1</field> <field type="CharField" name="layer_name">openembedded-core</field> @@ -61,9 +75,23 @@ <field rel="ManyToOneRel" to="orm.release" name="release">2</field> <field type="CharField" name="layer_name">meta-yocto-bsp</field> </object> + <object model="orm.releasedefaultlayer" pk="7"> + <field rel="ManyToOneRel" to="orm.release" name="release">3</field> + <field type="CharField" name="layer_name">openembedded-core</field> + </object> + <object model="orm.releasedefaultlayer" pk="8"> + <field rel="ManyToOneRel" to="orm.release" name="release">3</field> + <field type="CharField" name="layer_name">meta-poky</field> + </object> + <object model="orm.releasedefaultlayer" pk="9"> + <field rel="ManyToOneRel" to="orm.release" name="release">3</field> + <field type="CharField" name="layer_name">meta-yocto-bsp</field> + </object> - <!-- Layers for the Local release - layersource TYPE_LOCAL = 0 + <!-- Default layers provided by poky + openembedded-core + meta-poky + meta-yocto-bsp --> <object model="orm.layer" pk="1"> <field type="CharField" name="name">openembedded-core</field> @@ -73,19 +101,39 @@ <object model="orm.layer_version" pk="1"> <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> <field type="IntegerField" name="layer_source">0</field> + <field rel="ManyToOneRel" to="orm.release" name="release">1</field> + <field type="CharField" name="branch">morty</field> + <field type="CharField" name="dirpath">meta</field> + </object> + <object model="orm.layer_version" pk="2"> + <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> + <field type="IntegerField" name="layer_source">0</field> <field rel="ManyToOneRel" to="orm.release" name="release">2</field> <field type="CharField" name="branch">HEAD</field> <field type="CharField" name="commit">HEAD</field> <field type="CharField" name="dirpath">meta</field> </object> - + <object model="orm.layer_version" pk="3"> + <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> + <field type="IntegerField" name="layer_source">0</field> + <field rel="ManyToOneRel" to="orm.release" name="release">3</field> + <field type="CharField" name="branch">master</field> + <field type="CharField" name="dirpath">meta</field> + </object> <object model="orm.layer" pk="2"> <field type="CharField" name="name">meta-poky</field> <field type="CharField" name="layer_index_url"></field> <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> </object> - <object model="orm.layer_version" pk="2"> + <object model="orm.layer_version" pk="4"> + <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> + <field type="IntegerField" name="layer_source">0</field> + <field rel="ManyToOneRel" to="orm.release" name="release">1</field> + <field type="CharField" name="branch">morty</field> + <field type="CharField" name="dirpath">meta-poky</field> + </object> + <object model="orm.layer_version" pk="5"> <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> <field type="IntegerField" name="layer_source">0</field> <field rel="ManyToOneRel" to="orm.release" name="release">2</field> @@ -93,14 +141,27 @@ <field type="CharField" name="commit">HEAD</field> <field type="CharField" name="dirpath">meta-poky</field> </object> - + <object model="orm.layer_version" pk="6"> + <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> + <field type="IntegerField" name="layer_source">0</field> + <field rel="ManyToOneRel" to="orm.release" name="release">3</field> + <field type="CharField" name="branch">master</field> + <field type="CharField" name="dirpath">meta-poky</field> + </object> <object model="orm.layer" pk="3"> <field type="CharField" name="name">meta-yocto-bsp</field> <field type="CharField" name="layer_index_url"></field> <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> </object> - <object model="orm.layer_version" pk="3"> + <object model="orm.layer_version" pk="7"> + <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> + <field type="IntegerField" name="layer_source">0</field> + <field rel="ManyToOneRel" to="orm.release" name="release">1</field> + <field type="CharField" name="branch">morty</field> + <field type="CharField" name="dirpath">meta-yocto-bsp</field> + </object> + <object model="orm.layer_version" pk="8"> <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> <field type="IntegerField" name="layer_source">0</field> <field rel="ManyToOneRel" to="orm.release" name="release">2</field> @@ -108,4 +169,11 @@ <field type="CharField" name="commit">HEAD</field> <field type="CharField" name="dirpath">meta-yocto-bsp</field> </object> + <object model="orm.layer_version" pk="9"> + <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> + <field type="IntegerField" name="layer_source">0</field> + <field rel="ManyToOneRel" to="orm.release" name="release">3</field> + <field type="CharField" name="branch">master</field> + <field type="CharField" name="dirpath">meta-yocto-bsp</field> + </object> </django-objects> -- 2.7.4 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
