From e975d26e84100ccd4c7fd675d29304f8d5bdfbcc Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Fri, 15 Apr 2016 07:30:40 -0700 Subject: documentation: Converted "meta-yocto" to "meta-poky" Occurrences in many manuals and one figure. (From yocto-docs rev: 26d30cd162083c62216fb4ab526d0b231f453de1) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- .../toaster-manual/toaster-manual-reference.xml | 32 +++++++++++----------- .../toaster-manual-setup-and-use.xml | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'documentation/toaster-manual') diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml index cb27107143..3a46b61b73 100644 --- a/documentation/toaster-manual/toaster-manual-reference.xml +++ b/documentation/toaster-manual/toaster-manual-reference.xml @@ -172,9 +172,9 @@ The first version of the file is found in the conf directory of the - meta-yocto layer + meta-poky layer (i.e. - meta-yocto/conf/toasterconf.json). + meta-poky/conf/toasterconf.json). This version contains the default Yocto Project configuration for Toaster. @@ -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 @@ toasterconf.json file you just edited. For example, if you cloned the poky repository and you edited the - meta-yocto/conf/toasterconf.json file, + meta-poky/conf/toasterconf.json file, you would type something like the following: - $ 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 After entering this command, you need to update the Toaster database with the information coming from your @@ -575,9 +575,9 @@ The - meta-yocto/conf/toasterconf.json + meta-poky/conf/toasterconf.json in the conf directory of the - Yocto Project's meta-yocto layer. + Yocto Project's meta-poky 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 <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\">Yocto Project master branch</a>, 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 <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\">Yocto Project 2.0 \"Jethro\"</a> 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 <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\">Yocto Project 1.8 \"Fido\"</a> 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." } diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.xml b/documentation/toaster-manual/toaster-manual-setup-and-use.xml index e8fb168ce8..963b211223 100644 --- a/documentation/toaster-manual/toaster-manual-setup-and-use.xml +++ b/documentation/toaster-manual/toaster-manual-setup-and-use.xml @@ -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 -- cgit v1.2.3-54-g00ecf