summaryrefslogtreecommitdiff
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-09-28 10:24:13 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-28 11:47:23 +0100
commite0ffab2321b22b40333a0e857d42c16ae599cc0c (patch)
tree94f768442ce1c8583766b9a56e2fc180ffee98a7 /meta/classes/package_rpm.bbclass
parent64c0279e6b0d2325a326058476228360898550f3 (diff)
downloadopenembedded-core-e0ffab2321b22b40333a0e857d42c16ae599cc0c.tar.gz
openembedded-core-e0ffab2321b22b40333a0e857d42c16ae599cc0c.tar.bz2
openembedded-core-e0ffab2321b22b40333a0e857d42c16ae599cc0c.tar.xz
openembedded-core-e0ffab2321b22b40333a0e857d42c16ae599cc0c.zip
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. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 775d52503..d32784125 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -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 () {