image.bbclass: Add ldconfig-native dependency, run ldconfig at image generation time

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3218 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 6 insertions, 2 deletions

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index fde0f59993..ff8d7521da 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -5,7 +5,7 @@ PACKAGES = ""
 RDEPENDS += "${IMAGE_INSTALL}"
 
 # "export IMAGE_BASENAME" not supported at this time
-IMAGE_BASENAME[export] = 1
+IMAGE_BASENAME[export] = "1"
 export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
 
 # We need to recursively follow RDEPENDS and RRECOMMENDS for images
@@ -20,7 +20,7 @@ PID = "${@os.getpid()}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-do_rootfs[depends] += "makedevs-native:do_populate_staging fakeroot-native:do_populate_staging"
+do_rootfs[depends] += "makedevs-native:do_populate_staging fakeroot-native:do_populate_staging ldconfig-native:do_populate_staging"
 
 python () {
     import bb
@@ -104,6 +104,10 @@ fakeroot do_rootfs () {
                 ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
         done
 
+        # Run ldconfig on the image to create a valid cache 
+        # (new format for cross arch compatibility)
+        ldconfig -r ${IMAGE_ROOTFS} -c new
+
         ${IMAGE_POSTPROCESS_COMMAND}
         
         ${MACHINE_POSTPROCESS_COMMAND}