summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-05 17:21:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-05 22:20:53 +0100
commit751f42b943cbb060a95a158c17b0c5b825ae3dfa (patch)
treeb3b64ede2234f6c61bbce3fbcb1df16f2b906a4e
parent889551a5708d66c6e3e9a3030ad3a25ca5a0daac (diff)
downloadpoky-751f42b943cbb060a95a158c17b0c5b825ae3dfa.tar.gz
image.bbclass: Disable ldconfig-native when using uclibc
(From OE-Core rev: 58286c2bc19f073d273895ad760689e2074489e4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass16
1 files changed, 11 insertions, 5 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index d693ea5984..7d31d04a24 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -23,7 +23,11 @@ PID = "${@os.getpid()}"
23 23
24PACKAGE_ARCH = "${MACHINE_ARCH}" 24PACKAGE_ARCH = "${MACHINE_ARCH}"
25 25
26do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ldconfig-native:do_populate_sysroot" 26LDCONFIGDEPEND = "ldconfig-native:do_populate_sysroot"
27LDCONFIGDEPEND_linux-uclibc = ""
28LDCONFIGDEPEND_linux-uclibceabi = ""
29
30do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}"
27do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot" 31do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot"
28 32
29python () { 33python () {
@@ -96,10 +100,12 @@ fakeroot do_rootfs () {
96 100
97 insert_feed_uris 101 insert_feed_uris
98 102
99 # Run ldconfig on the image to create a valid cache 103 if [ "x${LDCONFIGDEPEND}" != "x" ]; then
100 # (new format for cross arch compatibility) 104 # Run ldconfig on the image to create a valid cache
101 echo executing: ldconfig -r ${IMAGE_ROOTFS} -c new -v 105 # (new format for cross arch compatibility)
102 ldconfig -r ${IMAGE_ROOTFS} -c new -v 106 echo executing: ldconfig -r ${IMAGE_ROOTFS} -c new -v
107 ldconfig -r ${IMAGE_ROOTFS} -c new -v
108 fi
103 109
104 # (re)create kernel modules dependencies 110 # (re)create kernel modules dependencies
105 # This part is done by kernel-module-* postinstall scripts but if image do 111 # This part is done by kernel-module-* postinstall scripts but if image do