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.bbclass30
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index f1b829fe18..1799bf1865 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -164,28 +164,28 @@ do_rootfs[umask] = "022"
164 164
165fakeroot do_rootfs () { 165fakeroot do_rootfs () {
166 #set -x 166 #set -x
167 # When use the rpm incremental image generation, don't remove the rootfs 167 # When use the rpm incremental image generation, don't remove the rootfs
168 if [ "${INC_RPM_IMAGE_GEN}" != "1" -o "${IMAGE_PKGTYPE}" != "rpm" ]; then 168 if [ "${INC_RPM_IMAGE_GEN}" != "1" -o "${IMAGE_PKGTYPE}" != "rpm" ]; then
169 rm -rf ${IMAGE_ROOTFS} 169 rm -rf ${IMAGE_ROOTFS}
170 elif [ -d ${T}/saved_rpmlib/var/lib/rpm ]; then 170 elif [ -d ${T}/saved_rpmlib/var/lib/rpm ]; then
171 # Move the rpmlib back 171 # Move the rpmlib back
172 if [ ! -d ${IMAGE_ROOTFS}/var/lib/rpm ]; then 172 if [ ! -d ${IMAGE_ROOTFS}/var/lib/rpm ]; then
173 mkdir -p ${IMAGE_ROOTFS}/var/lib/ 173 mkdir -p ${IMAGE_ROOTFS}/var/lib/
174 mv ${T}/saved_rpmlib/var/lib/rpm ${IMAGE_ROOTFS}/var/lib/ 174 mv ${T}/saved_rpmlib/var/lib/rpm ${IMAGE_ROOTFS}/var/lib/
175 fi 175 fi
176 fi 176 fi
177 rm -rf ${MULTILIB_TEMP_ROOTFS} 177 rm -rf ${MULTILIB_TEMP_ROOTFS}
178 mkdir -p ${IMAGE_ROOTFS} 178 mkdir -p ${IMAGE_ROOTFS}
179 mkdir -p ${DEPLOY_DIR_IMAGE} 179 mkdir -p ${DEPLOY_DIR_IMAGE}
180 180
181 cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt || true 181 cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt || true
182 182
183 # If "${IMAGE_ROOTFS}/dev" exists, then the device had been made by 183 # If "${IMAGE_ROOTFS}/dev" exists, then the device had been made by
184 # the previous build 184 # the previous build
185 if [ "${USE_DEVFS}" != "1" -a ! -r "${IMAGE_ROOTFS}/dev" ]; then 185 if [ "${USE_DEVFS}" != "1" -a ! -r "${IMAGE_ROOTFS}/dev" ]; then
186 for devtable in ${@get_devtable_list(d)}; do 186 for devtable in ${@get_devtable_list(d)}; do
187 # Always return ture since there maybe already one when use the 187 # Always return ture since there maybe already one when use the
188 # incremental image generation 188 # incremental image generation
189 makedevs -r ${IMAGE_ROOTFS} -D $devtable 189 makedevs -r ${IMAGE_ROOTFS} -D $devtable
190 done 190 done
191 fi 191 fi
@@ -398,7 +398,7 @@ rootfs_trim_schemas () {
398 # Need this in case no files exist 398 # Need this in case no files exist
399 if [ -e $schema ]; then 399 if [ -e $schema ]; then
400 oe-trim-schemas $schema > $schema.new 400 oe-trim-schemas $schema > $schema.new
401 mv $schema.new $schema 401 mv $schema.new $schema
402 fi 402 fi
403 done 403 done
404} 404}