diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2016-02-25 10:54:37 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 17:00:28 +0000 |
commit | 8ea55ba895286aac9c33918434d3b008101ecb46 (patch) | |
tree | 145ab33472c0a7f2f02867f320f6ed506eb3abba /meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch | |
parent | 6833c5d77b99ab3f07945ba8e0bbe03df3dc317c (diff) | |
download | poky-8ea55ba895286aac9c33918434d3b008101ecb46.tar.gz |
rpm: A number of the patches have been submitted upstream
Note the upstream submission in the patches.
(From OE-Core rev: 9672f7620a365d29afca81d357d1d4d5fcedb3ed)
Signed-off-by: Mark Hatle <mark.hatle@windriver.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.patch | 2 |
1 files changed, 1 insertions, 1 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 index ed5d8a7dac..1a48db63c6 100644 --- 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 | |||
@@ -20,7 +20,7 @@ This caused the system to only permit a binary comparison - "new preferred" or | |||
20 | else comparison the system will now perform a 'last-in-wins' resolution when | 20 | else comparison the system will now perform a 'last-in-wins' resolution when |
21 | "neither is preferred". | 21 | "neither is preferred". |
22 | 22 | ||
23 | Upstream-Status: Pending | 23 | Upstream-Status: Submitted [RPM5 maintainer] |
24 | 24 | ||
25 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 25 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
26 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 26 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |