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:00:31 +0100
commitbbd2eae187f9d6cadf03cbe8d84259593e3551ce (patch)
tree890d93eeefebe49bb026c478701eecd4b974f24c
parentce3f296ec9021d207cb80cb2c697932b83fd0e81 (diff)
downloadopenembedded-core-contrib-bbd2eae187f9d6cadf03cbe8d84259593e3551ce.tar.gz
openembedded-core-contrib-bbd2eae187f9d6cadf03cbe8d84259593e3551ce.tar.bz2
openembedded-core-contrib-bbd2eae187f9d6cadf03cbe8d84259593e3551ce.zip
conf: Account for eglibc->glibc move
Change references in documentation appropriately Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/conf/documentation.conf4
-rw-r--r--meta/conf/layer.conf2
-rw-r--r--meta/conf/local.conf.sample.extended4
3 files changed, 5 insertions, 5 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
#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 1f7d5c7a84..9143bdb93d 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 \
diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended
index f7d8798e7f..196590e55e 100644
--- a/meta/conf/local.conf.sample.extended
+++ b/meta/conf/local.conf.sample.extended
@@ -25,8 +25,8 @@
# be appropriate for example.
-# eglibc configurability is used to reduce minimal image's size.
-# the all supported eglibc options are listed in DISTRO_FEATURES_LIBC
+# glibc configurability is used to reduce minimal image's size.
+# the all supported glibc options are listed in DISTRO_FEATURES_LIBC
# and disabled by default. Uncomment and copy the DISTRO_FEATURES_LIBC
# and DISTRO_FEATURES definitions to local.conf to enable the options.
#DISTRO_FEATURES_LIBC = "ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \