diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-07 16:31:48 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-07 16:31:48 +0000 |
commit | 30238161a6ad7bb6f7a91d589567e1dd5b0196c7 (patch) | |
tree | 238b4dbc19852298dd767dbc7d9df50a3e7102fa | |
parent | b402db44f08040115c3e6f83ff90c931dd86fe57 (diff) | |
download | poky-30238161a6ad7bb6f7a91d589567e1dd5b0196c7.tar.gz |
image.bbclass: Generate the image after running the kernel modules and ldconfig commands, not before
-rw-r--r-- | meta/classes/image.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index e3bb748dd8..f16dcc20ff 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -109,11 +109,6 @@ fakeroot do_rootfs () { | |||
109 | 109 | ||
110 | insert_feed_uris | 110 | insert_feed_uris |
111 | 111 | ||
112 | ${IMAGE_PREPROCESS_COMMAND} | ||
113 | |||
114 | ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{print ${IMAGE_EXTRA_SPACE} + $1}'` | ||
115 | ${@get_imagecmds(d)} | ||
116 | |||
117 | # Run ldconfig on the image to create a valid cache | 112 | # Run ldconfig on the image to create a valid cache |
118 | # (new format for cross arch compatibility) | 113 | # (new format for cross arch compatibility) |
119 | ldconfig -r ${IMAGE_ROOTFS} -c new | 114 | ldconfig -r ${IMAGE_ROOTFS} -c new |
@@ -129,6 +124,11 @@ fakeroot do_rootfs () { | |||
129 | ${TARGET_SYS}-depmod-2.6 -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION | 124 | ${TARGET_SYS}-depmod-2.6 -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION |
130 | fi | 125 | fi |
131 | 126 | ||
127 | ${IMAGE_PREPROCESS_COMMAND} | ||
128 | |||
129 | ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{print ${IMAGE_EXTRA_SPACE} + $1}'` | ||
130 | ${@get_imagecmds(d)} | ||
131 | |||
132 | ${IMAGE_POSTPROCESS_COMMAND} | 132 | ${IMAGE_POSTPROCESS_COMMAND} |
133 | 133 | ||
134 | ${MACHINE_POSTPROCESS_COMMAND} | 134 | ${MACHINE_POSTPROCESS_COMMAND} |