toaster:update fixtures for morty release
cover toaster:update fixtures for morty release
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
PATCH 1/3 toaster: Update oe-core fixture for Morty release
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.
--- bitbake/lib/toaster/orm/fixtures/oe-core.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
bitbake/lib/toaster/orm/fixtures/oe-core.xml +8 -8
@@ -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 <a href=\"http://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> 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 <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=morty\">OpenEmbedded Morty</a> 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>
Signature · 1 line
1.9.1
PATCH 2/3 toaster: Update poky fixture for Morty release
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.
--- bitbake/lib/toaster/orm/fixtures/poky.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
bitbake/lib/toaster/orm/fixtures/poky.xml +6 -6
@@ -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 <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> + <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/?h=morty">Yocto Project Morty branch</a>.</field> </object> <object model="orm.release" pk="2"> <field type="CharField" name="name">local</field>
Signature · 1 line
1.9.1
PATCH 3/3 toaster: Update default release to Morty
In reply to brian averySet Morty to be the default release in toaster for the Morty release when creating new projects.
--- bitbake/lib/toaster/orm/fixtures/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
bitbake/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">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>
Signature · 1 line
1.9.1
Re: [PATCH 1/3] toaster: Update oe-core fixture for Morty release
In reply to brian averyQuoted 15 lines · 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 <[email protected]>--- bitbake/lib/toaster/orm/fixtures/oe-core.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)bitbake/lib/toaster/orm/fixtures/oe-core.xml +0
-0
bitbake/lib/toaster/orm/fixtures/oe-core.xml line 13
Quoted 8 lines
bitbake/lib/toaster/orm/fixtures/oe-core.xml +2
-2@@ -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
Quoted 34 lines
bitbake/lib/toaster/orm/fixtures/oe-core.xml +6
-6</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 <a href=\"http://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> 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 <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=morty\">OpenEmbedded Morty</a> 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>
Re: [PATCH 3/3] toaster: Update default release to Morty
In reply to brian averySent upstream to bitbake-devel with:
- Fix branch name in oe-core for bitbake
- Add "2.2" as part of the description
Thanks,
Michael
Quoted 21 lines · brian avery
Set Morty to be the default release in toaster for the Morty release when creating new projects.
Signed-off-by brian avery <[email protected]>--- bitbake/lib/toaster/orm/fixtures/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)bitbake/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">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>