diff options
| author | Changqing Li <changqing.li@windriver.com> | 2020-05-08 10:30:32 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-09 18:57:21 +0100 |
| commit | 07083caab6f6456114341671744a11e5c0a3267a (patch) | |
| tree | f3b50abe1a37a17048fd96c5d823940e61994a11 /meta/recipes-extended/asciidoc | |
| parent | a073a3e2d3c9d3ee64ef9b64ee13f386123568d9 (diff) | |
| download | poky-07083caab6f6456114341671744a11e5c0a3267a.tar.gz | |
rpm: fix file conflicts for MIPS64 N32
The following error occurred when prefer_color set to 2:
Error: Transaction check error:
file /sbin/ldconfig conflicts between attempted installs of
ldconfig-2.31+git0+71f2b249a2-r0.mips64_n32 and
lib32-ldconfig-2.31+git0+71f2b249a2-r0.mips32r2
file /usr/bin/gencat conflicts between attempted installs of
lib32-libc6-utils-2.31+git0+71f2b249a2-r0.mips32r2
...
This was because:
transactions_color = 001 (ELF32) & 010 (ELF64) & 100 (ELF32 N32 MIPS64)
FColor = Current file color (001) & transaction_color (111)
oFcolor = Previous file color (100) & transaction_color (111)
when "neither preferred" happened, handled as conflicts. this is too
restrictive for three way conflicts(mips64/mips64 n32/mips(32)).
Fixed by perform a 'last-in-wins' resolution when "neither is preferred".
refer:
https://github.com/rpm-software-management/rpm/issues/193
https://git.openembedded.org/openembedded-core/commit/meta/recipes-devtools/rpm?id=36c225704daa58b98a4b7f2ef315eb944d8628b5
(From OE-Core rev: f94511fe5c163de8fb34d00ff3ba995437c3922c)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/asciidoc')
0 files changed, 0 insertions, 0 deletions