Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 77EEF612E5 for ; Wed, 2 Dec 2015 21:30:47 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id tB2LUmwc025038 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL) for ; Wed, 2 Dec 2015 13:30:48 -0800 (PST) Received: from msp-dhcp23.wrs.com (172.25.34.23) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.248.2; Wed, 2 Dec 2015 13:30:47 -0800 From: Mark Hatle To: Date: Wed, 2 Dec 2015 15:30:44 -0600 Message-ID: <1449091845-168695-2-git-send-email-mark.hatle@windriver.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1449091845-168695-1-git-send-email-mark.hatle@windriver.com> References: <1449091845-168695-1-git-send-email-mark.hatle@windriver.com> MIME-Version: 1.0 Subject: [PATCH 1/2] rpm_5.4.14: Enable MIPS64 N32 transactions X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2015 21:30:50 -0000 Content-Type: text/plain 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 Signed-off-by: Robert Yang --- meta/recipes-devtools/rpm/rpm_5.4.14.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index d40cf2a..e22d208 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -413,6 +413,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 -- 2.5.0