summaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r--meta/classes/image.bbclass11
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 295b653c97..3034725ac2 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -134,15 +134,22 @@ do_rootfs[umask] = 022
134 134
135fakeroot do_rootfs () { 135fakeroot do_rootfs () {
136 #set -x 136 #set -x
137 rm -rf ${IMAGE_ROOTFS} 137 # When use the rpm incremental image generation, don't remove the rootfs
138 if [ "${INC_RPM_IMAGE_GEN}" != "1" -o "${IMAGE_PKGTYPE}" != "rpm" ]; then
139 rm -rf ${IMAGE_ROOTFS}
140 fi
138 rm -rf ${MULTILIB_TEMP_ROOTFS} 141 rm -rf ${MULTILIB_TEMP_ROOTFS}
139 mkdir -p ${IMAGE_ROOTFS} 142 mkdir -p ${IMAGE_ROOTFS}
140 mkdir -p ${DEPLOY_DIR_IMAGE} 143 mkdir -p ${DEPLOY_DIR_IMAGE}
141 144
142 cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt 145 cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
143 146
144 if [ "${USE_DEVFS}" != "1" ]; then 147 # If "${IMAGE_ROOTFS}/dev" exists, then the device had been made by
148 # the previous build
149 if [ "${USE_DEVFS}" != "1" -a ! -r "${IMAGE_ROOTFS}/dev" ]; then
145 for devtable in ${@get_devtable_list(d)}; do 150 for devtable in ${@get_devtable_list(d)}; do
151 # Always return ture since there maybe already one when use the
152 # incremental image generation
146 makedevs -r ${IMAGE_ROOTFS} -D $devtable 153 makedevs -r ${IMAGE_ROOTFS} -D $devtable
147 done 154 done
148 fi 155 fi