summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-23 17:05:35 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-23 17:05:35 +0000
commitb4e9ef8979677683d8aa01c7b5301bbde4f2a340 (patch)
treee0fecc1a92f3e430c45055477aaad4758180605e
parent87590b264974a81c58b3a0f55415198bb8e4837a (diff)
downloadpoky-b4e9ef8979677683d8aa01c7b5301bbde4f2a340.tar.gz
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
-rw-r--r--meta/classes/image.bbclass8
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 = ""
5RDEPENDS += "${IMAGE_INSTALL}" 5RDEPENDS += "${IMAGE_INSTALL}"
6 6
7# "export IMAGE_BASENAME" not supported at this time 7# "export IMAGE_BASENAME" not supported at this time
8IMAGE_BASENAME[export] = 1 8IMAGE_BASENAME[export] = "1"
9export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}" 9export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
10 10
11# We need to recursively follow RDEPENDS and RRECOMMENDS for images 11# We need to recursively follow RDEPENDS and RRECOMMENDS for images
@@ -20,7 +20,7 @@ PID = "${@os.getpid()}"
20 20
21PACKAGE_ARCH = "${MACHINE_ARCH}" 21PACKAGE_ARCH = "${MACHINE_ARCH}"
22 22
23do_rootfs[depends] += "makedevs-native:do_populate_staging fakeroot-native:do_populate_staging" 23do_rootfs[depends] += "makedevs-native:do_populate_staging fakeroot-native:do_populate_staging ldconfig-native:do_populate_staging"
24 24
25python () { 25python () {
26 import bb 26 import bb
@@ -104,6 +104,10 @@ fakeroot do_rootfs () {
104 ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type 104 ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
105 done 105 done
106 106
107 # Run ldconfig on the image to create a valid cache
108 # (new format for cross arch compatibility)
109 ldconfig -r ${IMAGE_ROOTFS} -c new
110
107 ${IMAGE_POSTPROCESS_COMMAND} 111 ${IMAGE_POSTPROCESS_COMMAND}
108 112
109 ${MACHINE_POSTPROCESS_COMMAND} 113 ${MACHINE_POSTPROCESS_COMMAND}