summaryrefslogtreecommitdiffstats
path: root/meta
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 15:14:46 +0100
commit5527983bcc8839c74de8ca21ed90151dbf9d1c25 (patch)
tree0abb53439145da375e5a825e07ebf714cdde1c11 /meta
parent594d886f09c339fe6de29c5431cad2db971cb4f3 (diff)
downloadpoky-5527983bcc8839c74de8ca21ed90151dbf9d1c25.tar.gz
task-core-nfs/image.bbclass: Fix some libc overrides
(From OE-Core rev: 4616095d75c0c13953e0bb339b0cafc3c3eb8314) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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()}"
24PACKAGE_ARCH = "${MACHINE_ARCH}" 24PACKAGE_ARCH = "${MACHINE_ARCH}"
25 25
26LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot" 26LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot"
27LDCONFIGDEPEND_linux-uclibc = "" 27LDCONFIGDEPEND_libc-uclibc = ""
28LDCONFIGDEPEND_linux-uclibceabi = ""
29 28
30do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}" 29do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}"
31do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot" 30do_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 = "\
22# rpcinfo can be useful but only with glibc images 22# rpcinfo can be useful but only with glibc images
23GLIBC_DEPENDENCIES = "glibc-utils" 23GLIBC_DEPENDENCIES = "glibc-utils"
24 24
25RRECOMMENDS_task-core-nfs-server_append_linux = " ${GLIBC_DEPENDENCIES}" 25RRECOMMENDS_task-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}"
26RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = " ${GLIBC_DEPENDENCIES}" 26