[oe-commits] Richard Purdie : task-core-nfs/image.bbclass: Fix some libc overrides

[git version control]

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

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue May 17 14:52:27 2011 +0100

task-core-nfs/image.bbclass: Fix some libc overrides

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/image.bbclass               |    3 +--
 meta/recipes-core/tasks/task-core-nfs.bb |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 346dd5e..2469442 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -24,8 +24,7 @@ PID = "${@os.getpid()}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot"
-LDCONFIGDEPEND_linux-uclibc = ""
-LDCONFIGDEPEND_linux-uclibceabi = ""
+LDCONFIGDEPEND_libc-uclibc = ""
 
 do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}"
 do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot"
diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb
index 20e042b..5859fad 100644
--- a/meta/recipes-core/tasks/task-core-nfs.bb
+++ b/meta/recipes-core/tasks/task-core-nfs.bb
@@ -22,5 +22,5 @@ RDEPENDS_task-core-nfs-server = "\
 # rpcinfo can be useful but only with glibc images
 GLIBC_DEPENDENCIES = "glibc-utils"
 
-RRECOMMENDS_task-core-nfs-server_append_linux = " ${GLIBC_DEPENDENCIES}"
-RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = " ${GLIBC_DEPENDENCIES}"
+RRECOMMENDS_task-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}"
+