mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-14 08:02:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

package_rpm.bbclass: no initial_solution in the second build

Browse Source 
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>
This commit is contained in:
Robert Yang
2012-09-25 21:38:37 +08:00
committed by Richard Purdie
parent 65d2b3af37
commit 598528484c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
meta/classes/package_rpm.bbclass
View File

@@ -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...