summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-09-25 21:38:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-26 15:02:29 +0100
commit598528484c15a387e447aa0c7e232cbbbb7ffb24 (patch)
tree6e6271da05c15119987c31c9039aec2689cfcea2 /meta/classes/package_rpm.bbclass
parent65d2b3af3758c4b74d66abcfa1fb380c0ca17ea1 (diff)
downloadpoky-598528484c15a387e447aa0c7e232cbbbb7ffb24.tar.gz
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 <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass11
1 files changed, 7 insertions, 4 deletions
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 () {
317 # we should add the previous solution manifest to the full "original" set to 317 # we should add the previous solution manifest to the full "original" set to
318 # avoid duplicate install steps. 318 # avoid duplicate install steps.
319 echo "Update original solution..." 319 echo "Update original solution..."
320 cat ${target_rootfs}/install/initial_solution.manifest >> ${target_rootfs}/install/original_solution.manifest 320 for m in ${target_rootfs}/install/initial_solution.manifest \
321 cat ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/original_solution.manifest 321 ${target_rootfs}/install/total_solution.manifest; do
322 rm ${target_rootfs}/install/initial_solution.manifest 322 if [ -s $m ]; then
323 rm ${target_rootfs}/install/total_solution.manifest 323 cat $m >> ${target_rootfs}/install/original_solution.manifest
324 rm -f $m
325 fi
326 done
324 fi 327 fi
325 328
326 # Setup manifest of packages to install... 329 # Setup manifest of packages to install...