[OE-core] [PATCH 2/2] rootfs_rpm.bbclass: don't remove rpmlib when INC_RPM_IMAGE_GEN=1

[Robert Yang]

Don't remove rpmlib when INC_RPM_IMAGE_GEN=1, otherwise the
list_installed_packages would get nothing in the second build.

[YOCTO #2440]

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
 meta/classes/rootfs_rpm.bbclass |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 9039b21..8ec03d2 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -154,8 +154,11 @@ EOF
 }
 
 remove_packaging_data_files() {
-	rm -rf ${IMAGE_ROOTFS}${rpmlibdir}
-	rm -rf ${IMAGE_ROOTFS}${opkglibdir}
+	# Don't remove the rpmlib when INC_RPM_IMAGE_GEN=1
+	if [ "${INC_RPM_IMAGE_GEN}" != "1" ]; then
+		rm -rf ${IMAGE_ROOTFS}${rpmlibdir}
+		rm -rf ${IMAGE_ROOTFS}${opkglibdir}
+	fi
 }
 
 RPM_QUERY_CMD = '${RPM} --root ${IMAGE_ROOTFS} -D "_dbpath ${rpmlibdir}" \
-- 
1.7.1