mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

documentation: Converted "meta-yocto" to "meta-poky"

Browse Source 
Occurrences in many manuals and one figure.

(From yocto-docs rev: 26d30cd162083c62216fb4ab526d0b231f453de1)

Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Rifenbark
2016-04-15 07:30:40 -07:00
committed by Richard Purdie
parent 84452ee325
commit e975d26e84
10 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
documentation/toaster-manual/toaster-manual-reference.xml
+16 -16
View File
@@ -172,9 +172,9 @@
<listitem><para>
The first version of the file is found in the
<filename>conf</filename> directory of the
<filename>meta-yocto</filename> layer
<filename>meta-poky</filename> layer
(i.e.
<filename>meta-yocto/conf/toasterconf.json</filename>).
<filename>meta-poky/conf/toasterconf.json</filename>).
This version contains the default Yocto Project
configuration for Toaster.
</para></listitem>
@@ -214,10 +214,10 @@
"dirpath": "meta"
},
{
"name": "meta-yocto",
"local_path": "meta-yocto",
"name": "meta-poky",
"local_path": "meta-poky",
"vcs_url": "remote:origin",
"dirpath": "meta-yocto"
"dirpath": "meta-poky"
},
{
"name": "meta-yocto-bsp",
@@ -293,10 +293,10 @@
<filename>toasterconf.json</filename> file you just edited.
For example, if you cloned the
<filename>poky</filename> repository and you edited the
<filename>meta-yocto/conf/toasterconf.json</filename> file,
<filename>meta-poky/conf/toasterconf.json</filename> file,
you would type something like the following:
<literallayout class='monospaced'>
$ bitbake/lib/toaster/manage.py loadconf /home/scottrif/poky/meta-yocto/conf/toasterconf.json
$ bitbake/lib/toaster/manage.py loadconf /home/scottrif/poky/meta-poky/conf/toasterconf.json
</literallayout>
After entering this command, you need to update the
Toaster database with the information coming from your
@@ -575,9 +575,9 @@
<itemizedlist>
<listitem><para>
The
<filename>meta-yocto/conf/toasterconf.json</filename>
<filename>meta-poky/conf/toasterconf.json</filename>
in the <filename>conf</filename> directory of the
Yocto Project's <filename>meta-yocto</filename> layer.
Yocto Project's <filename>meta-poky</filename> layer.
This version contains the default Yocto Project
configuration for Toaster.
You are prompted to select this file during the Toaster
@@ -698,10 +698,10 @@
"dirpath": "meta"
},
{
"name": "meta-yocto",
"local_path": "meta-yocto",
"name": "meta-poky",
"local_path": "meta-poky",
"vcs_url": "remote:origin",
"dirpath": "meta-yocto"
"dirpath": "meta-poky"
},
{
"name": "meta-yocto-bsp",
@@ -817,7 +817,7 @@
"description": "Yocto Project master",
"bitbake": "master",
"branch": "master",
"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
"defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
"helptext": "Toaster will run your builds using the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\"&gt;Yocto Project master branch&lt;/a&gt;, where active development takes place. This is not a stable branch, so your builds might not work as expected."
},
@@ -826,7 +826,7 @@
"description": "Yocto Project 2.0 Jethro",
"bitbake": "jethro",
"branch": "jethro",
"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
"defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
"helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\"&gt;Yocto Project 2.0 \"Jethro\"&lt;/a&gt; branch."
},
@@ -835,7 +835,7 @@
"description": "Yocto Project 1.8 Fido",
"bitbake": "fido",
"branch": "fido",
"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
"defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
"helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\"&gt;Yocto Project 1.8 \"Fido\"&lt;/a&gt; branch."
},
@@ -844,7 +844,7 @@
"description": "Local Yocto Project",
"bitbake": "HEAD",
"branch": "HEAD",
"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
"defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
"helptext": "Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer."
}
documentation/toaster-manual/toaster-manual-setup-and-use.xml
+1 -1
View File
@@ -316,7 +316,7 @@
$ cd /var/www/toaster/poky/
$ ./bitbake/lib/toaster/manage.py syncdb
$ ./bitbake/lib/toaster/manage.py migrate
$ TOASTER_DIR=`pwd` TOASTER_CONF=./meta-yocto/conf/toasterconf.json ./bitbake/lib/toaster/manage.py checksettings
$ TOASTER_DIR=`pwd` TOASTER_CONF=./meta-poky/conf/toasterconf.json ./bitbake/lib/toaster/manage.py checksettings
$ ./bitbake/lib/toaster/manage.py collectstatic
</literallayout>
</para>