summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-08-13 14:11:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-16 11:14:34 +0100
commit033baea93df8f0d1fcd541b44ec58bb3710e2d57 (patch)
treeb6c6418a02f57f91ca3277a5bc37c7b297694dce /meta/classes
parent36d622b4c6e2ff1e976b713c6841383f4188f851 (diff)
downloadpoky-033baea93df8f0d1fcd541b44ec58bb3710e2d57.tar.gz
image.bbclass: create device table after package installation
Now that the makedevs supports using user/group names in the devcie table files, and it uses passwd and group files under the rootfs which is provided by the base-passwd package, we should let package installation finish first, so that makedevs can get a correct mapping from user/group names to uid/gid. The check for existence of ${IMAGE_ROOTFS}/dev is removed. This is because do_rootfs doesn't have 'nostamp' flag any more, so the do_rootfs task will not be rerun for every build. Checking for the existence of ${IMAGE_ROOTFS}/dev is not necessary any more. Besides, as base-files package also installs the /dev directory, this checking does not serve as a good criteria. [YOCTO #1159] (From OE-Core rev: d073ca77ba886c7912abd3ec0640881c00aea3bb) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 4aae3a7819..494664627d 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -297,9 +297,9 @@ fakeroot do_rootfs () {
297 # copy the intercept scripts 297 # copy the intercept scripts
298 cp ${COREBASE}/scripts/postinst-intercepts/* ${WORKDIR}/intercept_scripts/ 298 cp ${COREBASE}/scripts/postinst-intercepts/* ${WORKDIR}/intercept_scripts/
299 299
300 # If "${IMAGE_ROOTFS}/dev" exists, then the device had been made by 300 rootfs_${IMAGE_PKGTYPE}_do_rootfs
301 # the previous build 301
302 if [ "${USE_DEVFS}" != "1" -a ! -r "${IMAGE_ROOTFS}/dev" ]; then 302 if [ "${USE_DEVFS}" != "1" ]; then
303 for devtable in ${@get_devtable_list(d)}; do 303 for devtable in ${@get_devtable_list(d)}; do
304 # Always return ture since there maybe already one when use the 304 # Always return ture since there maybe already one when use the
305 # incremental image generation 305 # incremental image generation
@@ -307,8 +307,6 @@ fakeroot do_rootfs () {
307 done 307 done
308 fi 308 fi
309 309
310 rootfs_${IMAGE_PKGTYPE}_do_rootfs
311
312 # remove unneeded packages/files from the final image 310 # remove unneeded packages/files from the final image
313 rootfs_remove_unneeded 311 rootfs_remove_unneeded
314 312