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 <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
32b1c9150f
commit
f282b7a027
|
@ -395,6 +395,8 @@ package_install_internal_rpm () {
|
||||||
-D "__dbi_txn create nofsync private" \
|
-D "__dbi_txn create nofsync private" \
|
||||||
| grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_multilib_solution.manifest
|
| 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
|
# Attempt install
|
||||||
${RPM} --root ${target_rootfs} \
|
${RPM} --root ${target_rootfs} \
|
||||||
|
@ -403,8 +405,7 @@ package_install_internal_rpm () {
|
||||||
-D "_dbpath ${rpmlibdir}" \
|
-D "_dbpath ${rpmlibdir}" \
|
||||||
--noscripts --notriggers --noparentdirs --nolinktos --replacepkgs \
|
--noscripts --notriggers --noparentdirs --nolinktos --replacepkgs \
|
||||||
-D "__dbi_txn create nofsync private" \
|
-D "__dbi_txn create nofsync private" \
|
||||||
-Uhv ${target_rootfs}/install/install_solution.manifest \
|
-Uhv ${target_rootfs}/install/total_solution.manifest
|
||||||
${target_rootfs}/install/install_multilib_solution.manifest
|
|
||||||
}
|
}
|
||||||
|
|
||||||
python write_specfile () {
|
python write_specfile () {
|
||||||
|
|
Loading…
Reference in New Issue