From fd15d6e0c8da75951a91d4467eda23c229b1026d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 28 Aug 2014 06:13:57 +0000 Subject: recipes: Remove references to eglibc change use of eglibc related variabled to glibc equivalents Signed-off-by: Khem Raj --- meta/recipes-extended/lsof/lsof_4.87.bb | 4 ++-- .../packagegroups/packagegroup-core-lsb.bb | 18 +++++++++--------- .../texinfo-dummy-native/texinfo-dummy/template.py | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/lsof/lsof_4.87.bb b/meta/recipes-extended/lsof/lsof_4.87.bb index 5676cd9822..e7a1eb2129 100644 --- a/meta/recipes-extended/lsof/lsof_4.87.bb +++ b/meta/recipes-extended/lsof/lsof_4.87.bb @@ -30,8 +30,8 @@ export LSOF_INCLUDE = "${STAGING_INCDIR}" do_configure () { export LSOF_AR="${AR} cr" export LSOF_RANLIB="${RANLIB}" - if [ "x${EGLIBCVERSION}" != "x" ];then - LINUX_CLIB=`echo ${EGLIBCVERSION} |sed -e 's,\.,,g'` + if [ "x${GLIBCVERSION}" != "x" ];then + LINUX_CLIB=`echo ${GLIBCVERSION} |sed -e 's,\.,,g'` LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}" export LINUX_CLIB fi diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 30b6e1545f..dd96fbebaa 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -128,7 +128,7 @@ RDEPENDS_packagegroup-core-lsb-core = "\ cups \ diffutils \ ed \ - eglibc-utils \ + glibc-utils \ elfutils \ file \ findutils \ @@ -158,7 +158,7 @@ RDEPENDS_packagegroup-core-lsb-core = "\ util-linux \ xdg-utils \ \ - eglibc \ + glibc \ libgcc \ libpam \ libxml2 \ @@ -245,13 +245,13 @@ RDEPENDS_packagegroup-core-lsb-runtime-add = "\ libxml-parser-perl \ libxml-perl \ libxml-sax-perl \ - eglibc-localedatas \ - eglibc-gconvs \ - eglibc-charmaps \ - eglibc-binaries \ - eglibc-localedata-posix \ - eglibc-extra-nss \ - eglibc-pcprofile \ + glibc-localedatas \ + glibc-gconvs \ + glibc-charmaps \ + glibc-binaries \ + glibc-localedata-posix \ + glibc-extra-nss \ + glibc-pcprofile \ libclass-isa-perl \ libenv-perl \ libdumpvalue-perl \ diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py index b0ebf75a15..8b7033eccc 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py @@ -44,7 +44,7 @@ with details on the recipe that failed. """ % this_binary # Autotools setups query the version, so this is actually necessary. Some of -# them (lookin' at you, eglibc) actually look for the substring "GNU texinfo," +# them (lookin' at you, glibc) actually look for the substring "GNU texinfo," # so we put that substring in there without actually telling a lie. version_str = """ %s (fake texinfo, emulating GNU texinfo) 5.2 -- cgit 1.2.3-korg