[oe-commits] Khem Raj : conf: Account for eglibc->glibc move

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 23b425613ce4ac15d781139177884f29abd6d963
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=23b425613ce4ac15d781139177884f29abd6d963

Author: Khem Raj <raj.khem at gmail.com>
Date:   Thu Aug 28 06:10:13 2014 +0000

conf: Account for eglibc->glibc move

Change references in documentation appropriately

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 meta/conf/documentation.conf | 4 ++--
 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 7cf4476..dd55685 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
 
 #E
 
-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."
+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."
 ERROR_QA[doc] = "Specifies the quality assurance checks whose failures are reported as errors by the OpenEmbedded build system."
 EXCLUDE_FROM_WORLD[doc] = "Directs BitBake to exclude a recipe from world builds (i.e. bitbake world)."
 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
 TARGET_OS[doc] = "Specifies the target's operating system."
 TARGET_PREFIX[doc] = "The prefix for the cross-compile toolchain (e.g. arm-linux-)."
 TARGET_SYS[doc] = "The target system is comprised of TARGET_ARCH,TARGET_VENDOR and TARGET_OS."
-TCLIBC[doc] = "Specifies GNU standard C library (libc) variant to use during the build process. You can select 'eglibc' or 'uclibc'."
+TCLIBC[doc] = "Specifies GNU standard C library (libc) variant to use during the build process. You can select 'glibc' or 'uclibc'."
 TCMODE[doc] = "Enables an external toolchain (where provided by an additional layer) if set to a value other than 'default'."
 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."
 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 1f7d5c7..9143bdb 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -34,7 +34,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
 "
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
-  gcc-cross-${TARGET_ARCH}->eglibc \
+  gcc-cross-${TARGET_ARCH}->glibc \
   gcc-cross-${TARGET_ARCH}->musl \
   gcc-cross-${TARGET_ARCH}->uclibc \
   gcc-cross-${TARGET_ARCH}->linux-libc-headers \