[OE-core] [FIDO PATCH 1/1] toasterconf: remove master as a branch option from fido release
Joshua Lock
joshua.lock at collabora.co.uk
Tue Sep 1 12:17:04 UTC 2015
On Thu, 2015-08-20 at 16:04 -0700, brian avery wrote:
> From: Alexandru DAMIAN <alexandru.damian at intel.com>
>
> Toaster isn't designed to be forward compatible. As such,
> a release cannot build releases newer then it.
>
> Particularly, "fido" cannot build "master", so we remove
> "master" from the list of supported releases in "fido"
>
> [YOCTO #8154]
Thanks Brian, this patch is queued in my fido-next branch[1].
Regards,
Joshua
1. http://cgit.openembedded.org/openembedded-core-contrib/log/?h=joshua
gl/fido-next
>
> Signed-off-by: Alexandru DAMIAN <alexandru.damian at intel.com>
> Signed-off-by: brian avery <avery.brian at gmail.com>
> ---
> meta/conf/toasterconf.json | 23 ++++-------------------
> 1 file changed, 4 insertions(+), 19 deletions(-)
>
> diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json
> index c8e42ef..ecd6a9f 100644
> --- a/meta/conf/toasterconf.json
> +++ b/meta/conf/toasterconf.json
> @@ -12,7 +12,7 @@
> "name": "Local OpenEmbedded",
> "sourcetype": "local",
> "apiurl": "../../",
> - "branches": ["HEAD", "master", "fido", "dizzy"],
> + "branches": ["HEAD", "fido", "dizzy"],
> "layers": [
> {
> "name": "openembedded-core",
> @@ -26,24 +26,18 @@
> "name": "OpenEmbedded",
> "sourcetype": "layerindex",
> "apiurl": "
> http://layers.openembedded.org/layerindex/api/",
> - "branches": ["master", "fido", "dizzy"]
> + "branches": ["fido", "dizzy"]
> },
> {
> "name": "Imported layers",
> "sourcetype": "imported",
> "apiurl": "",
> - "branches": ["master", "fido", "dizzy", "HEAD"]
> + "branches": ["fido", "dizzy", "HEAD"]
>
> }
> ],
> "bitbake" : [
> {
> - "name": "master",
> - "giturl": "git://git.openembedded.org/bitbake",
> - "branch": "master",
> - "dirpath": ""
> - },
> - {
> "name": "fido",
> "giturl": "git://git.openembedded.org/bitbake",
> "branch": "1.26",
> @@ -63,19 +57,10 @@
> }
> ],
>
> - "defaultrelease": "master",
> + "defaultrelease": "fido",
>
> "releases": [
> {
> - "name": "master",
> - "description": "OpenEmbedded master",
> - "bitbake": "master",
> - "branch": "master",
> - "defaultlayers": [ "openembedded-core" ],
> - "layersourcepriority": { "Imported layers": 99, "Local
> OpenEmbedded" : 10, "OpenEmbedded" : 0 },
> - "helptext": "Toaster will run your builds using the tip
> of the <a href=\"
> http://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded ma
> ster</a> branch, where active development takes place. This is not a
> stable branch, so your builds might not work as expected."
> - },
> - {
> "name": "fido",
> "description": "OpenEmbedded Fido",
> "bitbake": "fido",
> --
> 1.9.1
>
More information about the Openembedded-core
mailing list