summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-08-28 06:10:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-01 18:02:59 +0100
commite64efe7e6120dbeb9a4b82ec9249a22f53a286b7 (patch)
treeed4cf0251b1f14af22eb558189bc8d0ade9aa9a9
parent00f33ffc808a577413fdd555d963bceb67d224df (diff)
downloadpoky-e64efe7e6120dbeb9a4b82ec9249a22f53a286b7.tar.gz
conf: Account for eglibc->glibc move
Change references in documentation appropriately (From OE-Core rev: bbd2eae187f9d6cadf03cbe8d84259593e3551ce) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/documentation.conf4
-rw-r--r--meta/conf/layer.conf2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 7cf4476a14..dd55685769 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -147,7 +147,7 @@ DL_DIR[doc] = "The central download directory used by the build process to store
147 147
148#E 148#E
149 149
150ENABLE_BINARY_LOCALE_GENERATION[doc] = "Controls which locales for eglibc are generated during the build. The variable is useful if the target device has 64Mbytes of RAM or less." 150ENABLE_BINARY_LOCALE_GENERATION[doc] = "Controls which locales for glibc are generated during the build. The variable is useful if the target device has 64Mbytes of RAM or less."
151ERROR_QA[doc] = "Specifies the quality assurance checks whose failures are reported as errors by the OpenEmbedded build system." 151ERROR_QA[doc] = "Specifies the quality assurance checks whose failures are reported as errors by the OpenEmbedded build system."
152EXCLUDE_FROM_WORLD[doc] = "Directs BitBake to exclude a recipe from world builds (i.e. bitbake world)." 152EXCLUDE_FROM_WORLD[doc] = "Directs BitBake to exclude a recipe from world builds (i.e. bitbake world)."
153EXTENDPE[doc] = "Used with file and pathnames to create a prefix for a recipe's version based on the recipe's PE value. If PE is set and greater than zero for a recipe, EXTENDPE becomes that value." 153EXTENDPE[doc] = "Used with file and pathnames to create a prefix for a recipe's version based on the recipe's PE value. If PE is set and greater than zero for a recipe, EXTENDPE becomes that value."
@@ -406,7 +406,7 @@ TARGET_FPU[doc] = "Specifies the method for handling FPU code. For FPU-less targ
406TARGET_OS[doc] = "Specifies the target's operating system." 406TARGET_OS[doc] = "Specifies the target's operating system."
407TARGET_PREFIX[doc] = "The prefix for the cross-compile toolchain (e.g. arm-linux-)." 407TARGET_PREFIX[doc] = "The prefix for the cross-compile toolchain (e.g. arm-linux-)."
408TARGET_SYS[doc] = "The target system is comprised of TARGET_ARCH,TARGET_VENDOR and TARGET_OS." 408TARGET_SYS[doc] = "The target system is comprised of TARGET_ARCH,TARGET_VENDOR and TARGET_OS."
409TCLIBC[doc] = "Specifies GNU standard C library (libc) variant to use during the build process. You can select 'eglibc' or 'uclibc'." 409TCLIBC[doc] = "Specifies GNU standard C library (libc) variant to use during the build process. You can select 'glibc' or 'uclibc'."
410TCMODE[doc] = "Enables an external toolchain (where provided by an additional layer) if set to a value other than 'default'." 410TCMODE[doc] = "Enables an external toolchain (where provided by an additional layer) if set to a value other than 'default'."
411TEST_IMAGE[doc] = "Enables test booting of virtual machine images under the QEMU emulator after any root filesystems are created and runs tests against those images." 411TEST_IMAGE[doc] = "Enables test booting of virtual machine images under the QEMU emulator after any root filesystems are created and runs tests against those images."
412TEST_QEMUBOOT_TIMEOUT[doc] = "The time in seconds allowed for an image to boot before automated runtime tests begin to run against an image." 412TEST_QEMUBOOT_TIMEOUT[doc] = "The time in seconds allowed for an image to boot before automated runtime tests begin to run against an image."
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 1f7d5c7a84..9143bdb93d 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -34,7 +34,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
34" 34"
35 35
36SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ 36SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
37 gcc-cross-${TARGET_ARCH}->eglibc \ 37 gcc-cross-${TARGET_ARCH}->glibc \
38 gcc-cross-${TARGET_ARCH}->musl \ 38 gcc-cross-${TARGET_ARCH}->musl \
39 gcc-cross-${TARGET_ARCH}->uclibc \ 39 gcc-cross-${TARGET_ARCH}->uclibc \
40 gcc-cross-${TARGET_ARCH}->linux-libc-headers \ 40 gcc-cross-${TARGET_ARCH}->linux-libc-headers \