diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 9ac72991f6..b0562c7d4d 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -110,7 +110,7 @@
BBLAYERS ?= " \
/usr/local/src/yocto/meta \
- /usr/local/src/yocto/meta-yocto \
+ /usr/local/src/yocto/meta-poky \
/usr/local/src/yocto/meta-yocto-bsp \
/usr/local/src/yocto/meta-mylayer \
"
@@ -1536,7 +1536,7 @@
BBLAYERS = ? " \
/usr/local/src/yocto/meta \
- /usr/local/src/yocto/meta-yocto \
+ /usr/local/src/yocto/meta-poky \
/usr/local/src/yocto/meta-yocto-bsp \
/usr/local/src/yocto/meta-myarm \
"
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 00cad99599..927dcf021b 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -72,7 +72,7 @@
meta,
meta-skeleton,
meta-selftest,
- meta-yocto, and
+ meta-poky, and
meta-yocto-bsp.
Each of these folders represents a distinct layer.
@@ -165,12 +165,12 @@
directory to the
BBPATH.
On the other hand, distro layers, such as
- meta-yocto, can choose
+ meta-poky, can choose
to enforce their own precedence over
BBPATH.
For an example of that syntax, see the
layer.conf file for
- the meta-yocto layer.
+ the meta-poky layer.
The recipes for the layers are
appended to
@@ -444,7 +444,7 @@
BBLAYERS ?= " \
$HOME/poky/meta \
- $HOME/poky/meta-yocto \
+ $HOME/poky/meta-poky \
$HOME/poky/meta-yocto-bsp \
$HOME/poky/meta-mylayer \
"
@@ -870,7 +870,7 @@
BBLAYERS = ?" \
/usr/local/src/yocto/meta \
- /usr/local/src/yocto/meta-yocto \
+ /usr/local/src/yocto/meta-poky \
/usr/local/src/yocto/meta-yocto-bsp \
/usr/local/src/yocto/meta-mylayer \
"
@@ -5511,14 +5511,14 @@
poky/build/conf directory needs to have the path to your local
meta-mylayer layer.
By default, the BBLAYERS variable contains paths to
- meta, meta-yocto, and
+ meta, meta-poky, and
meta-yocto-bsp in the
poky Git repository.
Add the path to your meta-mylayer location:
BBLAYERS ?= " \
$HOME/poky/meta \
- $HOME/poky/meta-yocto \
+ $HOME/poky/meta-poky \
$HOME/poky/meta-yocto-bsp \
$HOME/poky/meta-mylayer \
"
@@ -5987,7 +5987,7 @@
By default, TEMPLATECONF is set as
follows in the poky repository:
- TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf}
+ TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf}
This is the directory used by the build system to find templates
from which to build some key configuration files.
@@ -6039,7 +6039,7 @@
Aside from the *.sample configuration files,
the conf-notes.txt also resides in the
- default meta-yocto/conf directory.
+ default meta-poky/conf directory.
The scripts that set up the build environment
(i.e.
&OE_INIT_FILE;
@@ -10215,7 +10215,7 @@
One thing a development organization might want to consider
for end-user convenience is to modify
- meta-yocto/conf/bblayers.conf.sample to
+ meta-poky/conf/bblayers.conf.sample to
ensure that when the end user utilizes the released build
system to build an image, the development organization's
layers are included in the bblayers.conf
@@ -10230,7 +10230,7 @@
BBLAYERS ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-yocto-bsp \
##OEROOT##/meta-mylayer \
"
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index 6d4092f02c..75c992f16b 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -603,7 +603,7 @@
the
Build Directory
contains user-defined variables that affect every build.
- The meta-yocto/conf/distro/poky.conf
+ The meta-poky/conf/distro/poky.conf
configuration file defines Yocto "distro" configuration
variables used only when building with this policy.
Machine configuration files, which
@@ -1404,7 +1404,7 @@
Examine the maintainers.inc file, which is
located in the
Source Directory
- at meta-yocto/conf/distro/include, to
+ at meta-poky/conf/distro/include, to
see who is responsible for code.
Board Support Package (BSP) README Files:
@@ -1448,7 +1448,7 @@
For changes to BitBake (anything under the bitbake
directory), send your patch to the
bitbake-devel mailing list.
- For changes to meta-yocto, send your patch to the
+ For changes to meta-poky, send your patch to the
poky mailing list.For changes to other layers hosted on
yoctoproject.org (unless the
diff --git a/documentation/mega-manual/figures/user-configuration.png b/documentation/mega-manual/figures/user-configuration.png
old mode 100644
new mode 100755
index f2b3f8e7fe..c298401fc3
Binary files a/documentation/mega-manual/figures/user-configuration.png and b/documentation/mega-manual/figures/user-configuration.png differ
diff --git a/documentation/ref-manual/closer-look.xml b/documentation/ref-manual/closer-look.xml
index 42b99980a3..84ff584bad 100644
--- a/documentation/ref-manual/closer-look.xml
+++ b/documentation/ref-manual/closer-look.xml
@@ -73,7 +73,7 @@
-
+
@@ -100,7 +100,7 @@
- The meta-yocto layer inside Poky contains
+ The meta-poky layer inside Poky contains
a conf directory that has example
configuration files.
These example files are used as a basis for creating actual
@@ -158,7 +158,7 @@
To see the default configurations in a local.conf
file created by the build environment script, see the
local.conf.sample in the
- meta-yocto layer:
+ meta-poky layer:
Parallelism Options:
Controlled by the
diff --git a/documentation/ref-manual/figures/user-configuration.png b/documentation/ref-manual/figures/user-configuration.png
old mode 100644
new mode 100755
index f2b3f8e7fe..c298401fc3
Binary files a/documentation/ref-manual/figures/user-configuration.png and b/documentation/ref-manual/figures/user-configuration.png differ
diff --git a/documentation/ref-manual/ref-structure.xml b/documentation/ref-manual/ref-structure.xml
index a0b36f034b..e51ceb1bf5 100644
--- a/documentation/ref-manual/ref-structure.xml
+++ b/documentation/ref-manual/ref-structure.xml
@@ -123,8 +123,8 @@
-
- meta-yocto/
+
+ meta-poky/
This directory contains the configuration for the Poky
@@ -233,7 +233,7 @@
The script gets its default list of common targets from the
conf-notes.txt file, which is found in the
- meta-yocto directory within the
+ meta-poky directory within the
Source Directory.
Should you have custom distributions, it is very easy to modify
this configuration file to include your targets for your
@@ -260,7 +260,7 @@
The OpenEmbedded build system uses the template configuration
files, which are found by default in the
- meta-yocto/conf directory in the
+ meta-poky/conf directory in the
Source Directory.
See the
"Creating a Custom Template Configuration Directory"
@@ -373,7 +373,7 @@
The script gets its default list of common targets from the
conf-notes.txt file, which is found in the
- meta-yocto directory within the
+ meta-poky directory within the
Source Directory.
Should you have custom distributions, it is very easy to modify
this configuration file to include your targets for your
@@ -409,7 +409,7 @@
The OpenEmbedded build system uses the template configuration
files, which are found by default in the
- meta-yocto/conf directory in the
+ meta-poky/conf directory in the
Source Directory.
See the
"Creating a Custom Template Configuration Directory"
@@ -513,7 +513,7 @@
The source local.conf.sample file used
depends on the $TEMPLATECONF script variable,
- which defaults to meta-yocto/conf
+ which defaults to meta-poky/conf
when you are building from the Yocto Project development
environment and defaults to meta/conf when
you are building from the OpenEmbedded Core environment.
@@ -536,7 +536,7 @@
Source Directory.
You can find the Yocto Project version of the
local.conf.sample file in the
- meta-yocto/conf directory.
+ meta-poky/conf directory.
@@ -567,7 +567,7 @@
The source bblayers.conf.sample file used
depends on the $TEMPLATECONF script variable,
- which defaults to meta-yocto/conf
+ which defaults to meta-poky/conf
when you are building from the Yocto Project development
environment and defaults to meta/conf when
you are building from the OpenEmbedded Core environment.
@@ -588,7 +588,7 @@
Source Directory.
You can find the Yocto Project version of the
bblayers.conf.sample file in the
- meta-yocto/conf directory.
+ meta-poky/conf directory.
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 3e0c151415..244f68a3f7 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -1130,7 +1130,7 @@
BBLAYERS = " \
/home/scottrif/poky/meta \
- /home/scottrif/poky/meta-yocto \
+ /home/scottrif/poky/meta-poky \
/home/scottrif/poky/meta-yocto-bsp \
/home/scottrif/poky/meta-mykernel \
"
@@ -3112,7 +3112,7 @@
For example, the distribution configuration file for the
Poky distribution is named poky.conf
and resides in the
- meta-yocto/conf/distro directory of
+ meta-poky/conf/distro directory of
the
Source Directory.
@@ -6035,7 +6035,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
See the
- local.conf.sample.extended
+ local.conf.sample.extended
file for additional information.
You can also reference the
kernel.bbclass
@@ -6089,7 +6089,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
You cannot set the variable in a recipe file.
See the
- local.conf.sample.extended
+ local.conf.sample.extended
file for additional information.
@@ -7781,7 +7781,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
is "poky", the default value for
MIRRORS is defined in the
conf/distro/poky.conf file in the
- meta-yocto Git repository.
+ meta-poky Git repository.
@@ -9640,7 +9640,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
is "poky", the default value for
PREMIRRORS is defined in the
conf/distro/poky.conf file in the
- meta-yocto Git repository.
+ meta-poky Git repository.
@@ -11126,7 +11126,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
Specifies the version of the SDK.
The distribution configuration file (e.g.
- /meta-yocto/conf/distro/poky.conf)
+ /meta-poky/conf/distro/poky.conf)
defines the SDK_VERSION as follows:
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
@@ -14345,7 +14345,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
USER_CLASSES ?= "buildstats image-mklibs image-prelink"
For more information, see
- meta-yocto/conf/local.conf.sample in
+ meta-poky/conf/local.conf.sample in
the
Source Directory.
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