diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch index 98e52da3a8..7d443ccc6c 100644 --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b04ecb793a3c859985eead5e261785b27a4c4a20 Mon Sep 17 00:00:00 2001 | 1 | From ad530868e37f09e9236c085d25a834304750704b Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Thu, 7 May 2020 17:40:58 +0800 | 3 | Date: Thu, 7 May 2020 17:40:58 +0800 |
4 | Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 | 4 | Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 |
@@ -32,7 +32,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
32 | 1 file changed, 12 insertions(+), 1 deletion(-) | 32 | 1 file changed, 12 insertions(+), 1 deletion(-) |
33 | 33 | ||
34 | diff --git a/lib/transaction.c b/lib/transaction.c | 34 | diff --git a/lib/transaction.c b/lib/transaction.c |
35 | index 70d2587ac..b89b30060 100644 | 35 | index 5e4414d2a..b1c55bd44 100644 |
36 | --- a/lib/transaction.c | 36 | --- a/lib/transaction.c |
37 | +++ b/lib/transaction.c | 37 | +++ b/lib/transaction.c |
38 | @@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, | 38 | @@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, |