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 | 3 |
1 files changed, 1 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 8b9f1f7294..98e52da3a8 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 bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 | 1 | From b04ecb793a3c859985eead5e261785b27a4c4a20 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 |
| @@ -27,7 +27,6 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". | |||
| 27 | Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> | 27 | Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> |
| 28 | 28 | ||
| 29 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 29 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 30 | |||
| 31 | --- | 30 | --- |
| 32 | lib/transaction.c | 13 ++++++++++++- | 31 | lib/transaction.c | 13 ++++++++++++- |
| 33 | 1 file changed, 12 insertions(+), 1 deletion(-) | 32 | 1 file changed, 12 insertions(+), 1 deletion(-) |
