[oe-commits] Robert Yang : package_rpm.bbclass: no initial_solution in the second build

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: ad17fa82a481ab3c9f17a8338ebad1eb07c0f9d8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ad17fa82a481ab3c9f17a8338ebad1eb07c0f9d8

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Tue Sep 25 21:38:37 2012 +0800

package_rpm.bbclass: no initial_solution in the second build

There is no initial_solution.manifest in the second build when
incremental rpm image generation, since the initial solution has been
skipped. So we should check it before cat it.

[YOCTO #3128]

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/package_rpm.bbclass |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 64689d8..ce34016 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -317,10 +317,13 @@ package_install_internal_rpm () {
 		# we should add the previous solution manifest to the full "original" set to
 		# avoid duplicate install steps.
 		echo "Update original solution..."
-		cat ${target_rootfs}/install/initial_solution.manifest >> ${target_rootfs}/install/original_solution.manifest
-		cat ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/original_solution.manifest
-		rm ${target_rootfs}/install/initial_solution.manifest
-		rm ${target_rootfs}/install/total_solution.manifest
+		for m in ${target_rootfs}/install/initial_solution.manifest \
+			${target_rootfs}/install/total_solution.manifest; do
+			if [ -s $m ]; then
+				cat $m >> ${target_rootfs}/install/original_solution.manifest
+				rm -f $m
+			fi
+		done
 	fi
 
 	# Setup manifest of packages to install...