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:42:53 +0000 |
commit | 01c0285677b4b831bcb9c796337f7e888f1d76ec (patch) | |
tree | 8c98c33b1ee6e34da58cf9b9e5b8662beb9f49f3 /meta/recipes-devtools/rpm | |
parent | a74258671f63f0d61e494ee7aa42b8756967a60a (diff) | |
download | poky-01c0285677b4b831bcb9c796337f7e888f1d76ec.tar.gz |
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.
(From OE-Core rev: dd86624034574484574d75adfcf68c2df4a7a6b7)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-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() { | |||
411 | sed -i -e 's,%_repackage_all_erasures[^_].*,%_repackage_all_erasures 0,' ${D}/${libdir}/rpm/macros | 411 | sed -i -e 's,%_repackage_all_erasures[^_].*,%_repackage_all_erasures 0,' ${D}/${libdir}/rpm/macros |
412 | sed -i -e 's,^#%_openall_before_chroot.*,%_openall_before_chroot\t1,' ${D}/${libdir}/rpm/macros | 412 | sed -i -e 's,^#%_openall_before_chroot.*,%_openall_before_chroot\t1,' ${D}/${libdir}/rpm/macros |
413 | 413 | ||
414 | # Enable MIPS64 N32 transactions. (This is a no-op on non-MIPS targets.) | ||
415 | sed -i -e 's,%_transaction_color[^_].*,%_transaction_color 7,' ${D}/${libdir}/rpm/macros | ||
416 | |||
414 | # Enable Debian style arbitrary tags... | 417 | # Enable Debian style arbitrary tags... |
415 | sed -i -e 's,%_arbitrary_tags[^_].*,%_arbitrary_tags %{_arbitrary_tags_debian},' ${D}/${libdir}/rpm/macros | 418 | sed -i -e 's,%_arbitrary_tags[^_].*,%_arbitrary_tags %{_arbitrary_tags_debian},' ${D}/${libdir}/rpm/macros |
416 | 419 | ||