diff options
author | Belen Barros Pena <belen.barros.pena@linux.intel.com> | 2016-04-18 16:15:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-18 16:49:28 +0100 |
commit | c59771e175194b9ff845b9aee168a06028b259a5 (patch) | |
tree | 78601857de62ea16797a78d776fc011306ebaf6f /meta/conf | |
parent | d0bce0b74ac0feff9a3030fa49b24d957444be40 (diff) | |
download | poky-c59771e175194b9ff845b9aee168a06028b259a5.tar.gz |
toasterconf.json: Update for krogoth release
Update the OpenEmbedded Toaster configuration file to include the
krogoth branch. Also, make sure the DISTRO default value is set to
"nodistro".
(From OE-Core rev: e003ef038819c10f351bb8268b377626c95bb077)
Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/toasterconf.json | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json index 3ce59b7369..c27880e109 100644 --- a/meta/conf/toasterconf.json +++ b/meta/conf/toasterconf.json | |||
@@ -13,7 +13,7 @@ | |||
13 | "name": "Local OpenEmbedded", | 13 | "name": "Local OpenEmbedded", |
14 | "sourcetype": "local", | 14 | "sourcetype": "local", |
15 | "apiurl": "../../", | 15 | "apiurl": "../../", |
16 | "branches": ["HEAD", "master", "jethro"], | 16 | "branches": ["HEAD", "master", "jethro", "krogoth"], |
17 | "layers": [ | 17 | "layers": [ |
18 | { | 18 | { |
19 | "name": "openembedded-core", | 19 | "name": "openembedded-core", |
@@ -27,13 +27,13 @@ | |||
27 | "name": "OpenEmbedded", | 27 | "name": "OpenEmbedded", |
28 | "sourcetype": "layerindex", | 28 | "sourcetype": "layerindex", |
29 | "apiurl": "http://layers.openembedded.org/layerindex/api/", | 29 | "apiurl": "http://layers.openembedded.org/layerindex/api/", |
30 | "branches": ["master", "jethro"] | 30 | "branches": ["master", "jethro", "krogoth"] |
31 | }, | 31 | }, |
32 | { | 32 | { |
33 | "name": "Imported layers", | 33 | "name": "Imported layers", |
34 | "sourcetype": "imported", | 34 | "sourcetype": "imported", |
35 | "apiurl": "", | 35 | "apiurl": "", |
36 | "branches": ["master", "jethro", "HEAD"] | 36 | "branches": ["master", "jethro", "krogoth", "HEAD"] |
37 | 37 | ||
38 | } | 38 | } |
39 | ], | 39 | ], |
@@ -51,6 +51,12 @@ | |||
51 | "dirpath": "" | 51 | "dirpath": "" |
52 | }, | 52 | }, |
53 | { | 53 | { |
54 | "name": "krogoth", | ||
55 | "giturl": "git://git.openembedded.org/bitbake", | ||
56 | "branch": "1.30", | ||
57 | "dirpath": "" | ||
58 | }, | ||
59 | { | ||
54 | "name": "HEAD", | 60 | "name": "HEAD", |
55 | "giturl": "git://git.openembedded.org/bitbake", | 61 | "giturl": "git://git.openembedded.org/bitbake", |
56 | "branch": "HEAD", | 62 | "branch": "HEAD", |
@@ -80,6 +86,15 @@ | |||
80 | "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" | 86 | "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" |
81 | }, | 87 | }, |
82 | { | 88 | { |
89 | "name": "krogoth", | ||
90 | "description": "OpenEmbedded Krogoth", | ||
91 | "bitbake": "krogoth", | ||
92 | "branch": "krogoth", | ||
93 | "defaultlayers": [ "openembedded-core" ], | ||
94 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, | ||
95 | "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" | ||
96 | }, | ||
97 | { | ||
83 | "name": "local", | 98 | "name": "local", |
84 | "description": "Local OpenEmbedded", | 99 | "description": "Local OpenEmbedded", |
85 | "bitbake": "HEAD", | 100 | "bitbake": "HEAD", |