From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id AC6086014E for ; Wed, 2 Dec 2015 17:32:28 +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 tB2HWSin000021 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL) for ; Wed, 2 Dec 2015 09:32:28 -0800 (PST) Received: from Marks-MacBook-Pro.local (172.25.36.232) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.3.248.2; Wed, 2 Dec 2015 09:32:28 -0800 To: Robert Yang , References: <3c0e2c74e4a3b791b699bd236ceedefae2bb25c2.1449063064.git.liezhi.yang@windriver.com> From: Mark Hatle Organization: Wind River Systems Message-ID: <565F2B2B.6020902@windriver.com> Date: Wed, 2 Dec 2015 11:32:27 -0600 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <3c0e2c74e4a3b791b699bd236ceedefae2bb25c2.1449063064.git.liezhi.yang@windriver.com> Subject: Re: [PATCH 2/2] rpm: fix file conflicts for MIPS64 N32 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 17:32:31 -0000 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit FYI, expect a 'v2' version of this. We found some further issues. The previous patch 1/2 is correct and won't change. --Mark On 12/2/15 7:32 AM, Robert Yang wrote: > Fixed: > 1) set %_transaction_color 7 in lib/rpm/macros to install MIPS64 N32 > 2) smart install libc6-2.22-r0.1@lib32_mips32r2octeon3 libc6-dbg-2.22-r0.1@lib32_mips32r2octeon3 > error: file /sbin/ldconfig conflicts between attempted installs of libc6-2.22-r0.1.lib32_mips32r2octeon3 and libc6-2.22-r0.1.octeon3_n32 > error: file /sbin/.debug/ldconfig conflicts between attempted installs of libc6-dbg-2.22-r0.1.lib32_mips32r2octeon3 and libc6-dbg-2.22-r0.1.octeon3_n32 > > This was because when elf file is MIPS64 N32: > FColor = 0x100 & 111 = 100 > Now 100 != 0 then error happened, the similar to oFColor. Check whether > FColor == 4 will fix the problem. > > Note, if _transaction_color is 3, MIPS64 N32 will be skipped (pretend as > installed). > > Signed-off-by: Robert Yang > --- > ...ction.c-fix-file-conflicts-for-mips64-N32.patch | 43 ++++++++++++++++++++ > meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 + > 2 files changed, 44 insertions(+) > create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch > > diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch b/meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch > new file mode 100644 > index 0000000..150afcf > --- /dev/null > +++ b/meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch > @@ -0,0 +1,43 @@ > +From 67ec7531e6297200eaa97ef917d49b0a75876cb4 Mon Sep 17 00:00:00 2001 > +From: Robert Yang > +Date: Wed, 2 Dec 2015 00:56:07 -0800 > +Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 > + > +Fixed: > +1) set %_transaction_color 7 in lib/rpm/macros to install MIPS64 N32 > +2) smart install libc6-2.22-r0.1@lib32_mips32r2octeon3 libc6-dbg-2.22-r0.1@lib32_mips32r2octeon3 > +error: file /sbin/ldconfig conflicts between attempted installs of libc6-2.22-r0.1.lib32_mips32r2octeon3 and libc6-2.22-r0.1.octeon3_n32 > +error: file /sbin/.debug/ldconfig conflicts between attempted installs of libc6-dbg-2.22-r0.1.lib32_mips32r2octeon3 and libc6-dbg-2.22-r0.1.octeon3_n32 > + > +This was because when elf file is MIPS64 N32: > +FColor = 0x100 & 111 = 100 > +Now 100 != 0 then error happened, the similar to oFColor. Check whether > +FColor == 4 will fix the problem. > + > +Note, if _transaction_color is 3, MIPS64 N32 will be skipped (pretend as > +installed). > + > +Upstream-Status: Pending > + > +Signed-off-by: Robert Yang > +--- > + lib/transaction.c | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/lib/transaction.c b/lib/transaction.c > +index fa60006..c4d84bb 100644 > +--- a/lib/transaction.c > ++++ b/lib/transaction.c > +@@ -420,7 +420,8 @@ assert(otherFi != NULL); > + fi->actions[i] = FA_SKIPCOLOR; > + rConflicts = 0; > + } else > +- if (FColor == 0 && oFColor == 0) { > ++ /* ... 4 is for MIPS64 N32, and prefcolor != 4 goes here. ... */ > ++ if ((FColor == 0 && oFColor == 0) || FColor == 4 || oFColor == 4) { > + /* ... otherwise, do both, last in wins. */ > + otherFi->actions[otherFileNum] = FA_CREATE; > + fi->actions[i] = FA_CREATE; > +-- > +1.7.9.5 > + > diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb > index b0e67c5..56f36bf 100644 > --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb > +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb > @@ -102,6 +102,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e > file://configure.ac-check-for-both-gpg2-and-gpg.patch \ > file://0001-define-EM_AARCH64.patch \ > file://rpm-rpmfc.c-fix-for-N32-MIPS64.patch \ > + file://rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch \ > " > > # Uncomment the following line to enable platform score debugging >