diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2015-12-02 03:39:26 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-12 23:31:41 +0000 |
commit | dd86624034574484574d75adfcf68c2df4a7a6b7 (patch) | |
tree | 8edb8ae2ba92877b9d23c19dabea733d8ff34c1f | |
parent | 1096140cb1d2532ecb38ac5fbbbe13d40fdaf6af (diff) | |
download | openembedded-core-dd86624034574484574d75adfcf68c2df4a7a6b7.tar.gz openembedded-core-dd86624034574484574d75adfcf68c2df4a7a6b7.tar.bz2 openembedded-core-dd86624034574484574d75adfcf68c2df4a7a6b7.zip |
rpm: Enable MIPS64 N32 transactions
In a multilib install RPM will break a conflict using the transaction color.
However, by default MIPS64 N32 transactions are not enabled.
This change always enables them. This is effectively a no-op on non-MIPS
systems, and required if we need to support N32 on MIPS.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.14.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index 774a1a30e0..58a0934f0d 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -411,6 +411,9 @@ do_install_append() { sed -i -e 's,%_repackage_all_erasures[^_].*,%_repackage_all_erasures 0,' ${D}/${libdir}/rpm/macros sed -i -e 's,^#%_openall_before_chroot.*,%_openall_before_chroot\t1,' ${D}/${libdir}/rpm/macros + # Enable MIPS64 N32 transactions. (This is a no-op on non-MIPS targets.) + sed -i -e 's,%_transaction_color[^_].*,%_transaction_color 7,' ${D}/${libdir}/rpm/macros + # Enable Debian style arbitrary tags... sed -i -e 's,%_arbitrary_tags[^_].*,%_arbitrary_tags %{_arbitrary_tags_debian},' ${D}/${libdir}/rpm/macros |