diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-08-28 06:10:13 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-01 18:02:59 +0100 |
commit | e64efe7e6120dbeb9a4b82ec9249a22f53a286b7 (patch) | |
tree | ed4cf0251b1f14af22eb558189bc8d0ade9aa9a9 /meta/conf | |
parent | 00f33ffc808a577413fdd555d963bceb67d224df (diff) | |
download | poky-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>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/documentation.conf | 4 | ||||
-rw-r--r-- | meta/conf/layer.conf | 2 |
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 | ||
150 | ENABLE_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." | 150 | ENABLE_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." |
151 | ERROR_QA[doc] = "Specifies the quality assurance checks whose failures are reported as errors by the OpenEmbedded build system." | 151 | ERROR_QA[doc] = "Specifies the quality assurance checks whose failures are reported as errors by the OpenEmbedded build system." |
152 | EXCLUDE_FROM_WORLD[doc] = "Directs BitBake to exclude a recipe from world builds (i.e. bitbake world)." | 152 | EXCLUDE_FROM_WORLD[doc] = "Directs BitBake to exclude a recipe from world builds (i.e. bitbake world)." |
153 | EXTENDPE[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." | 153 | EXTENDPE[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 | |||
406 | TARGET_OS[doc] = "Specifies the target's operating system." | 406 | TARGET_OS[doc] = "Specifies the target's operating system." |
407 | TARGET_PREFIX[doc] = "The prefix for the cross-compile toolchain (e.g. arm-linux-)." | 407 | TARGET_PREFIX[doc] = "The prefix for the cross-compile toolchain (e.g. arm-linux-)." |
408 | TARGET_SYS[doc] = "The target system is comprised of TARGET_ARCH,TARGET_VENDOR and TARGET_OS." | 408 | TARGET_SYS[doc] = "The target system is comprised of TARGET_ARCH,TARGET_VENDOR and TARGET_OS." |
409 | TCLIBC[doc] = "Specifies GNU standard C library (libc) variant to use during the build process. You can select 'eglibc' or 'uclibc'." | 409 | TCLIBC[doc] = "Specifies GNU standard C library (libc) variant to use during the build process. You can select 'glibc' or 'uclibc'." |
410 | TCMODE[doc] = "Enables an external toolchain (where provided by an additional layer) if set to a value other than 'default'." | 410 | TCMODE[doc] = "Enables an external toolchain (where provided by an additional layer) if set to a value other than 'default'." |
411 | TEST_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." | 411 | TEST_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." |
412 | TEST_QEMUBOOT_TIMEOUT[doc] = "The time in seconds allowed for an image to boot before automated runtime tests begin to run against an image." | 412 | TEST_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 | ||
36 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | 36 | SIGGEN_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 \ |