sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

package_rpm: combine normal and multilib solution manifest together 

When RPM does the real install, if the first manifest file is empty, the
installation will stop without handling the second manifest file.

Merge the two manifest files together to fix this issue.

(From OE-Core rev: e0ffab2321b22b40333a0e857d42c16ae599cc0c)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dongxiao Xu 2011-09-28 10:24:13 +08:00 committed by Richard Purdie
parent 6f6863a258
commit fae0e6c29d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/classes/package_rpm.bbclass
View File

@ -395,6 +395,8 @@ package_install_internal_rpm () {
-D "__dbi_txn create nofsync private" \
| grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_multilib_solution.manifest
cat ${target_rootfs}/install/install_solution.manifest > ${target_rootfs}/install/total_solution.manifest
cat ${target_rootfs}/install/install_multilib_solution.manifest >> ${target_rootfs}/install/total_solution.manifest
# Attempt install
${RPM} --root ${target_rootfs} \
@ -403,8 +405,7 @@ package_install_internal_rpm () {
-D "_dbpath ${rpmlibdir}" \
--noscripts --notriggers --noparentdirs --nolinktos --replacepkgs \
-D "__dbi_txn create nofsync private" \
-Uhv ${target_rootfs}/install/install_solution.manifest \
${target_rootfs}/install/install_multilib_solution.manifest
-Uhv ${target_rootfs}/install/total_solution.manifest
}
python write_specfile () {