diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2012-09-25 21:38:37 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-26 14:56:20 +0100 |
| commit | ad17fa82a481ab3c9f17a8338ebad1eb07c0f9d8 (patch) | |
| tree | 31199ebf7fa4c78a7629da6da1c29791ddd3327d /meta | |
| parent | 7069c7ef829f56ae6dd0dab5e583342f351274ed (diff) | |
| download | openembedded-core-ad17fa82a481ab3c9f17a8338ebad1eb07c0f9d8.tar.gz openembedded-core-ad17fa82a481ab3c9f17a8338ebad1eb07c0f9d8.tar.bz2 openembedded-core-ad17fa82a481ab3c9f17a8338ebad1eb07c0f9d8.zip | |
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | 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 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... |