From f282b7a027a05900883a5941a857c4e5e33d133d Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Wed, 28 Sep 2011 10:24:13 +0800 Subject: [PATCH] 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: 20e6f166858751c6305cd8a52f87cdf78c1a8126) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 5 +++-- 1 file 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 () { -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 () {