summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/image.bbclass6
-rw-r--r--meta/classes/rootfs_rpm.bbclass6
2 files changed, 11 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 9557433..90a6a9d 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -143,6 +143,12 @@ fakeroot do_rootfs () {
143 # When use the rpm incremental image generation, don't remove the rootfs 143 # When use the rpm incremental image generation, don't remove the rootfs
144 if [ "${INC_RPM_IMAGE_GEN}" != "1" -o "${IMAGE_PKGTYPE}" != "rpm" ]; then 144 if [ "${INC_RPM_IMAGE_GEN}" != "1" -o "${IMAGE_PKGTYPE}" != "rpm" ]; then
145 rm -rf ${IMAGE_ROOTFS} 145 rm -rf ${IMAGE_ROOTFS}
146 elif [ -d ${T}/saved_rpmlib/var/lib/rpm ]; then
147 # Move the rpmlib back
148 if [ ! -d ${IMAGE_ROOTFS}/var/lib/rpm ]; then
149 mkdir -p ${IMAGE_ROOTFS}/var/lib/
150 mv ${T}/saved_rpmlib/var/lib/rpm ${IMAGE_ROOTFS}/var/lib/
151 fi
146 fi 152 fi
147 rm -rf ${MULTILIB_TEMP_ROOTFS} 153 rm -rf ${MULTILIB_TEMP_ROOTFS}
148 mkdir -p ${IMAGE_ROOTFS} 154 mkdir -p ${IMAGE_ROOTFS}
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 9039b21..fbc46c0 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -154,7 +154,11 @@ EOF
154} 154}
155 155
156remove_packaging_data_files() { 156remove_packaging_data_files() {
157 rm -rf ${IMAGE_ROOTFS}${rpmlibdir} 157 # Save the rpmlib for increment rpm image generation
158 t="${T}/saved_rpmlib/var/lib"
159 rm -fr $t
160 mkdir -p $t
161 mv ${IMAGE_ROOTFS}${rpmlibdir} $t
158 rm -rf ${IMAGE_ROOTFS}${opkglibdir} 162 rm -rf ${IMAGE_ROOTFS}${opkglibdir}
159} 163}
160 164