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 --- documentation/ref-manual/closer-look.xml | 6 +++--- .../ref-manual/figures/user-configuration.png | Bin 23687 -> 74109 bytes documentation/ref-manual/ref-structure.xml | 20 ++++++++++---------- documentation/ref-manual/ref-variables.xml | 16 ++++++++-------- 4 files changed, 21 insertions(+), 21 deletions(-) mode change 100644 => 100755 documentation/ref-manual/figures/user-configuration.png (limited to 'documentation/ref-manual') 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 @@ -
- <filename>meta-yocto/</filename> +
+ <filename>meta-poky/</filename> 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. -- cgit v1.2.3-54-g00ecf