summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 14:52:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 14:52:27 +0100
commit4616095d75c0c13953e0bb339b0cafc3c3eb8314 (patch)
treefb8280945aef6bc35ca369761fa23135408edb1f
parentcd9662ff326de05332afabea3ec35bbbd861687c (diff)
downloadopenembedded-core-contrib-4616095d75c0c13953e0bb339b0cafc3c3eb8314.tar.gz
openembedded-core-contrib-4616095d75c0c13953e0bb339b0cafc3c3eb8314.tar.bz2
openembedded-core-contrib-4616095d75c0c13953e0bb339b0cafc3c3eb8314.zip
task-core-nfs/image.bbclass: Fix some libc overrides
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass3
-rw-r--r--meta/recipes-core/tasks/task-core-nfs.bb4
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 346dd5edc3..2469442d70 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 20e042bd20..5859fad071 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}"
+