From 01c0285677b4b831bcb9c796337f7e888f1d76ec Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Dec 2015 03:39:26 -0800 Subject: 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 Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm_5.4.14.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/recipes-devtools/rpm/rpm_5.4.14.bb') 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 -- cgit v1.2.3-54-g00ecf