diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-05 17:21:53 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-05 17:21:53 +0100 |
| commit | 58286c2bc19f073d273895ad760689e2074489e4 (patch) | |
| tree | 9b4999945939f1e1a4927b3bf819637c3a317ae2 /meta/classes/image.bbclass | |
| parent | 0d4ea5d7486dc35001582bef3ff6ebfad0606bda (diff) | |
| download | openembedded-core-58286c2bc19f073d273895ad760689e2074489e4.tar.gz | |
image.bbclass: Disable ldconfig-native when using uclibc
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
| -rw-r--r-- | meta/classes/image.bbclass | 16 |
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()}" PACKAGE_ARCH = "${MACHINE_ARCH}" -do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ldconfig-native:do_populate_sysroot" +LDCONFIGDEPEND = "ldconfig-native:do_populate_sysroot" +LDCONFIGDEPEND_linux-uclibc = "" +LDCONFIGDEPEND_linux-uclibceabi = "" + +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" python () { @@ -96,10 +100,12 @@ fakeroot do_rootfs () { insert_feed_uris - # Run ldconfig on the image to create a valid cache - # (new format for cross arch compatibility) - echo executing: ldconfig -r ${IMAGE_ROOTFS} -c new -v - ldconfig -r ${IMAGE_ROOTFS} -c new -v + if [ "x${LDCONFIGDEPEND}" != "x" ]; then + # Run ldconfig on the image to create a valid cache + # (new format for cross arch compatibility) + echo executing: ldconfig -r ${IMAGE_ROOTFS} -c new -v + ldconfig -r ${IMAGE_ROOTFS} -c new -v + fi # (re)create kernel modules dependencies # This part is done by kernel-module-* postinstall scripts but if image do |