summaryrefslogtreecommitdiffstats
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 14:58:53 +0100
commitfae0e6c29dbf2a8c0a1ffb7d4092c48687133165 (patch)
tree29eab9832cb47668d8067cb66557681291019930
parent6f6863a2581b434390c0729cd9915306ffbf6924 (diff)
downloadpoky-fae0e6c29dbf2a8c0a1ffb7d4092c48687133165.tar.gz
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>
-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 775d525033..d327841250 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -395,6 +395,8 @@ package_install_internal_rpm () {
395 -D "__dbi_txn create nofsync private" \ 395 -D "__dbi_txn create nofsync private" \
396 | grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_multilib_solution.manifest 396 | grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_multilib_solution.manifest
397 397
398 cat ${target_rootfs}/install/install_solution.manifest > ${target_rootfs}/install/total_solution.manifest
399 cat ${target_rootfs}/install/install_multilib_solution.manifest >> ${target_rootfs}/install/total_solution.manifest
398 400
399 # Attempt install 401 # Attempt install
400 ${RPM} --root ${target_rootfs} \ 402 ${RPM} --root ${target_rootfs} \
@@ -403,8 +405,7 @@ package_install_internal_rpm () {
403 -D "_dbpath ${rpmlibdir}" \ 405 -D "_dbpath ${rpmlibdir}" \
404 --noscripts --notriggers --noparentdirs --nolinktos --replacepkgs \ 406 --noscripts --notriggers --noparentdirs --nolinktos --replacepkgs \
405 -D "__dbi_txn create nofsync private" \ 407 -D "__dbi_txn create nofsync private" \
406 -Uhv ${target_rootfs}/install/install_solution.manifest \ 408 -Uhv ${target_rootfs}/install/total_solution.manifest
407 ${target_rootfs}/install/install_multilib_solution.manifest
408} 409}
409 410
410python write_specfile () { 411python write_specfile () {