From: Dongxiao Xu <[email protected]>

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 <[email protected]>
---
 meta/classes/package_rpm.bbclass |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 45de0f8..fa0d8c3 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 () {
-- 
1.7.6


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to