Re: [PATCH 059/106] toaster: Update OE json file

[Michael Wood <michael.g.wood@intel.com>]

Should be able to drop this one as it appears upstream already

Michael

On 24/05/16 12:39, Belen Barros Pena wrote:
> Update the OpenEmbedded Toaster configuration file to include the
> krogoth branch. Also, make sure the DISTRO default value is set to
> "nodistro".
>
> Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com>
> ---
>   meta/conf/toasterconf.json | 23 +++++++++++++++++++----
>   1 file changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json
> index a05734f..ffa2346 100644
> --- a/meta/conf/toasterconf.json
> +++ b/meta/conf/toasterconf.json
> @@ -1,7 +1,7 @@
>   {
>       "config": {
>           "MACHINE"      : "qemux86",
> -        "DISTRO"       : "poky",
> +        "DISTRO"       : "nodistro",
>           "DL_DIR"       : "${TOPDIR}/../downloads",
>           "IMAGE_FSTYPES": "ext3 jffs2 tar.bz2",
>           "IMAGE_INSTALL_append": "",
> @@ -13,7 +13,7 @@
>               "name": "Local OpenEmbedded",
>               "sourcetype": "local",
>               "apiurl": "../../",
> -            "branches": ["HEAD", "master", "jethro"],
> +            "branches": ["HEAD", "master", "jethro", "krogoth"],
>               "layers": [
>                   {
>                       "name": "openembedded-core",
> @@ -27,13 +27,13 @@
>               "name": "OpenEmbedded",
>               "sourcetype": "layerindex",
>               "apiurl": "http://layers.openembedded.org/layerindex/api/",
> -            "branches": ["master", "jethro"]
> +            "branches": ["master", "jethro", "krogoth"]
>           },
>           {
>               "name": "Imported layers",
>               "sourcetype": "imported",
>               "apiurl": "",
> -            "branches": ["master", "jethro", "HEAD"]
> +            "branches": ["master", "jethro", "krogoth", "HEAD"]
>   
>           }
>       ],
> @@ -51,6 +51,12 @@
>               "dirpath": ""
>           },
>           {
> +            "name": "krogoth",
> +            "giturl": "git://git.openembedded.org/bitbake",
> +            "branch": "1.30",
> +            "dirpath": ""
> +        },
> +        {
>               "name": "HEAD",
>               "giturl": "git://git.openembedded.org/bitbake",
>               "branch": "HEAD",
> @@ -80,6 +86,15 @@
>               "helptext": "Toaster will run your builds with the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=jethro\">OpenEmbedded \"Jethro\"</a> branch"
>           },
>           {
> +            "name": "krogoth",
> +            "description": "OpenEmbedded Krogoth",
> +            "bitbake": "krogoth",
> +            "branch": "krogoth",
> +            "defaultlayers": [ "openembedded-core" ],
> +            "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" :  0 },
> +            "helptext": "Toaster will run your builds with the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=krogoth\">OpenEmbedded \"Krogoth\"</a> branch"
> +        },
> +        {
>               "name": "local",
>               "description": "Local OpenEmbedded",
>               "bitbake": "HEAD",