summaryrefslogtreecommitdiffstats
path: root/meta-poky
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@linux.intel.com>2016-04-18 15:08:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-18 15:49:28 (GMT)
commitee25d0e3987d7732a2e46e1640693b4cf419a9fc (patch)
tree11c5d6661d5bd01209529655f1c775cf7cba6c15 /meta-poky
parentb8e5de2b3313b91515a9165348b3e326610efe00 (diff)
downloadpoky-ee25d0e3987d7732a2e46e1640693b4cf419a9fc.tar.gz
toasterconf.json: Update for krogoth release
Update the Toaster configuration file in the meta-poky layer to include the Yocto Project 2.1 release. (From meta-yocto rev: 3f86af4148744c65b3d78f8df0d5e4d852cf7ae8) 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-poky')
-rw-r--r--meta-poky/conf/toasterconf.json19
1 files changed, 17 insertions, 2 deletions
diff --git a/meta-poky/conf/toasterconf.json b/meta-poky/conf/toasterconf.json
index f74e2a0..606aac7 100644
--- a/meta-poky/conf/toasterconf.json
+++ b/meta-poky/conf/toasterconf.json
@@ -40,13 +40,13 @@
40 "name": "OpenEmbedded", 40 "name": "OpenEmbedded",
41 "sourcetype": "layerindex", 41 "sourcetype": "layerindex",
42 "apiurl": "http://layers.openembedded.org/layerindex/api/", 42 "apiurl": "http://layers.openembedded.org/layerindex/api/",
43 "branches": ["master", "jethro"] 43 "branches": ["master", "jethro", "krogoth"]
44 }, 44 },
45 { 45 {
46 "name": "Imported layers", 46 "name": "Imported layers",
47 "sourcetype": "imported", 47 "sourcetype": "imported",
48 "apiurl": "", 48 "apiurl": "",
49 "branches": ["master", "jethro", "HEAD"] 49 "branches": ["master", "jethro", "krogoth", "HEAD"]
50 50
51 } 51 }
52 ], 52 ],
@@ -64,6 +64,12 @@
64 "dirpath": "bitbake" 64 "dirpath": "bitbake"
65 }, 65 },
66 { 66 {
67 "name": "krogoth",
68 "giturl": "remote:origin",
69 "branch": "krogoth",
70 "dirpath": "bitbake"
71 },
72 {
67 "name": "HEAD", 73 "name": "HEAD",
68 "giturl": "remote:origin", 74 "giturl": "remote:origin",
69 "branch": "HEAD", 75 "branch": "HEAD",
@@ -93,6 +99,15 @@
93 "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\">Yocto Project 2.0 \"Jethro\"</a> branch." 99 "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\">Yocto Project 2.0 \"Jethro\"</a> branch."
94 }, 100 },
95 { 101 {
102 "name": "krogoth",
103 "description": "Yocto Project 2.1 Krogoth",
104 "bitbake": "krogoth",
105 "branch": "krogoth",
106 "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
107 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
108 "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=krogoth\">Yocto Project 2.1 \"Krogoth\"</a> branch."
109 },
110 {
96 "name": "local", 111 "name": "local",
97 "description": "Local Yocto Project", 112 "description": "Local Yocto Project",
98 "bitbake": "HEAD", 113 "bitbake": "HEAD",