summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-12-30 18:38:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-14 14:42:16 +0000
commitbbddf83f65f490c88130d794c53ff9e4c45d0693 (patch)
treebec599b6bbb2c0022f922c97601cb621e4b3f3b9 /meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch
parent27d56eeebd8197e359aae0a7ccac74cb55ff794d (diff)
downloadpoky-bbddf83f65f490c88130d794c53ff9e4c45d0693.tar.gz
rpm: remove 5.x recipe
(From OE-Core rev: d0365f35303db3595688a6e5290677e02a72c54e) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch52
1 files changed, 0 insertions, 52 deletions
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
deleted file mode 100644
index 1a48db63c6..0000000000
--- a/meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 67ec7531e6297200eaa97ef917d49b0a75876cb4 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Wed, 2 Dec 2015 00:56:07 -0800
4Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32
5
6The following error can occur:
7 smart install libc6-2.22-r0.1@lib32_mips32r2octeon3 libc6-dbg-2.22-r0.1@lib32_mips32r2octeon3
8error: file /sbin/ldconfig conflicts between attempted installs of libc6-2.22-r0.1.lib32_mips32r2octeon3 and libc6-2.22-r0.1.octeon3_n32
9error: 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
10
11This was because:
12transactions_color = 001 (ELF32) & 010 (ELF64) & 100 (ELF32 N32 MIPS64)
13FColor = Current file color (001) & transaction_color (111)
14oFcolor = Previous file color (100) & transaction_color (111)
15
16There are two places where the conflict comparisons occur. In both places
17the 'else' clause was too restrictive (opposite of the 'positive' clause).
18This caused the system to only permit a binary comparison - "new preferred" or
19"old preferred". It did not permissing "neither preferred". By removing the
20else comparison the system will now perform a 'last-in-wins' resolution when
21"neither is preferred".
22
23Upstream-Status: Submitted [RPM5 maintainer]
24
25Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
26Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
27---
28 lib/transaction.c | 3 ++-
29 1 file changed, 2 insertions(+), 1 deletion(-)
30
31Index: rpm-5.4.14/lib/transaction.c
32===================================================================
33--- rpm-5.4.14.orig/lib/transaction.c
34+++ rpm-5.4.14/lib/transaction.c
35@@ -154,7 +154,7 @@ static int handleInstInstalledFile(const
36 fi->actions[fx] = FA_SKIPCOLOR;
37 #endif
38 rConflicts = 0;
39- } else if (FColor & prefcolor) {
40+ } else {
41 #ifdef REFERENCE
42 rpmfsSetAction(fs, fx, FA_CREATE);
43 #else
44@@ -420,7 +420,7 @@ assert(otherFi != NULL);
45 fi->actions[i] = FA_SKIPCOLOR;
46 rConflicts = 0;
47 } else
48- if (FColor == 0 && oFColor == 0) {
49+ {
50 /* ... otherwise, do both, last in wins. */
51 otherFi->actions[otherFileNum] = FA_CREATE;
52 fi->actions[i] = FA_CREATE;