From 598528484c15a387e447aa0c7e232cbbbb7ffb24 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 25 Sep 2012 21:38:37 +0800 Subject: 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] (From OE-Core rev: ad17fa82a481ab3c9f17a8338ebad1eb07c0f9d8) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 64689d8d72..ce34016555 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... -- cgit v1.2.3-54-g00ecf