summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2016-02-25 10:54:37 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 17:00:28 +0000
commit8ea55ba895286aac9c33918434d3b008101ecb46 (patch)
tree145ab33472c0a7f2f02867f320f6ed506eb3abba /meta
parent6833c5d77b99ab3f07945ba8e0bbe03df3dc317c (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/debugedit-segv.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/header-include-fix.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-opendb-before-verifyscript-to-avoid-null-point.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform2.patch4
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpmatch.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/uclibc-support.patch2
35 files changed, 36 insertions, 36 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch b/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch
index f5fcfecf31..c9fb268687 100644
--- a/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch
+++ b/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch
@@ -1,6 +1,6 @@
1[PATCH] define EM_AARCH64 1[PATCH] define EM_AARCH64
2 2
3Upstream-Status: pending 3Upstream-Status: Submitted [RPM5 maintainer]
4 4
5EM_AARCH64 maybe not be defined due to old version elf.h, and lead to 5EM_AARCH64 maybe not be defined due to old version elf.h, and lead to
6that debugedit can not work on aarch64 elf object files, since there is 6that debugedit can not work on aarch64 elf object files, since there is
diff --git a/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch b/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch
index 23bc3361d9..7128250093 100644
--- a/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch
+++ b/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch
@@ -4,7 +4,7 @@ Date: Tue, 11 Nov 2014 16:28:22 +0800
4Subject: [PATCH] using poptParseArgvString to parse the 4Subject: [PATCH] using poptParseArgvString to parse the
5 _gpg_check_password_cmd 5 _gpg_check_password_cmd
6 6
7Upstream-Status: Pending 7Upstream-Status: Submitted [RPM5 maintainer]
8 8
9Both __gpg_check_password_cmd and __gpg_sign_cmd include "%{_gpg_name}", but 9Both __gpg_check_password_cmd and __gpg_sign_cmd include "%{_gpg_name}", but
10strace shows that gpg_name has a quote when run _gpg_check_password, 10strace shows that gpg_name has a quote when run _gpg_check_password,
diff --git a/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch b/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch
index 585cf12fd8..c83c8b5f3f 100644
--- a/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch
+++ b/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch
@@ -11,7 +11,7 @@ Note: in all other places a backup copy was used, just not buildid processing.
11Also the process (...) function was modified to verify the data is not 11Also the process (...) function was modified to verify the data is not
12NULL as well. This is an extra check and is not strictly necessary. 12NULL as well. This is an extra check and is not strictly necessary.
13 13
14Upstream-Status: Pending 14Upstream-Status: Submitted [RPM5 maintainer]
15 15
16Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 16Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
17 17
diff --git a/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch b/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch
index f7c31006b4..8040482536 100644
--- a/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch
+++ b/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch
@@ -14,7 +14,7 @@ Before the above operations, invoke elf_begin/elf_update/elf_end
14with ELF_C_RDWR and ELF_F_LAYOUT set to enlarge the above file, it 14with ELF_C_RDWR and ELF_F_LAYOUT set to enlarge the above file, it
15could make sure the file is safe for the following elf operations. 15could make sure the file is safe for the following elf operations.
16 16
17Upstream-Status: Pending 17Upstream-Status: Submitted [RPM5 maintainer]
18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19--- 19---
20 tools/debugedit.c | 25 +++++++++++++++++++++++++ 20 tools/debugedit.c | 25 +++++++++++++++++++++++++
diff --git a/meta/recipes-devtools/rpm/rpm/header-include-fix.patch b/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
index 576ff007a5..e72df45b5a 100644
--- a/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
@@ -5,7 +5,7 @@ Using rpmdb.h w/o including errno.h may result in a warning.
5Using rpmtag.h w/o also adding stdint.h will result in numerous failures 5Using rpmtag.h w/o also adding stdint.h will result in numerous failures
6about unknown types on modern compilers. 6about unknown types on modern compilers.
7 7
8Upstream-Status: Pending 8Upstream-Status: Submitted [RPM5 maintainer]
9 9
10Signed-off-by: Qing He <qing.he@intel.com> 10Signed-off-by: Qing He <qing.he@intel.com>
11Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 11Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
diff --git a/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch b/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch
index 8fab9eb42f..5d936db5a3 100644
--- a/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch
+++ b/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch
@@ -14,7 +14,7 @@ install-exec-am. It also removed the dependency in install-data-hook on
14install-pkgbinPROGRAMS. This means install-pkgbinPROGRAMS will only be run once 14install-pkgbinPROGRAMS. This means install-pkgbinPROGRAMS will only be run once
15so there whould be any file contention. 15so there whould be any file contention.
16 16
17Upstream-Status: Pending 17Upstream-Status: Submitted [RPM5 maintainer]
18 18
19Signed-off-by: Morgan Little <morgan.little@windriver.com> 19Signed-off-by: Morgan Little <morgan.little@windriver.com>
20 20
diff --git a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
index 471e6ea55b..590f58d893 100644
--- a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
+++ b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
@@ -4,7 +4,7 @@ We want to see the RPMSENSE_SCRIPT values for use with SMART. We also
4want to see the MISSINGOK value so we can avoid recommended packages causing 4want to see the MISSINGOK value so we can avoid recommended packages causing
5failures. 5failures.
6 6
7Upstream-Status: Pending 7Upstream-Status: Submitted [RPM5 maintainer]
8 8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10 10
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch b/meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch
index c6327719d9..cc241f4f16 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch
@@ -7,7 +7,7 @@ Provide an alternative. This alternative function is based on code from:
7 7
8Code is under an Apache 2.0 License. 8Code is under an Apache 2.0 License.
9 9
10Upstream-Status: Pending 10Upstream-Status: Submitted [RPM5 maintainer]
11 11
12Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
13 13
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch b/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
index 41ab498a0f..81fc84937a 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
@@ -14,7 +14,7 @@ This patch changes the list of supported items to:
14 <arch>-<vendor>-<os> 14 <arch>-<vendor>-<os>
15 <arch>-<vendor>-<os>-<extension> 15 <arch>-<vendor>-<os>-<extension>
16 16
17Upstream-Status: Pending 17Upstream-Status: Submitted [RPM5 maintainer]
18 18
19Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 19Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
20 20
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch b/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch
index 27a0a8df83..290ec1aa14 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch
@@ -1,7 +1,7 @@
1Occasionally the cp -p fails with a non-zero return code. This will cause 1Occasionally the cp -p fails with a non-zero return code. This will cause
2the system abort the build. 2the system abort the build.
3 3
4Upstream-Status: Pending 4Upstream-Status: Submitted [RPM5 maintainer]
5 5
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 6Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
7 7
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch b/meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch
index a6003bae7b..c57f24cd72 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch
@@ -1,6 +1,6 @@
1Fix an issue where parseEmbedded is not defined, but is still used. 1Fix an issue where parseEmbedded is not defined, but is still used.
2 2
3Upstream-Status: Pending 3Upstream-Status: Submitted [RPM5 maintainer]
4 4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 6
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch b/meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch
index e25c5aa353..36a418fc6a 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch
@@ -3,7 +3,7 @@ configure.ac: Check if the current compiler supports the transactions
3Some distributions appear to have compilers that are built without support 3Some distributions appear to have compilers that are built without support
4for transactions, even though they are GCC 4.7 or newer. 4for transactions, even though they are GCC 4.7 or newer.
5 5
6Upstream-Status: Pending 6Upstream-Status: Submitted [RPM5 maintainer]
7 7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9 9
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch
index 5deb2323ef..057925fb64 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch
@@ -8,7 +8,7 @@ are found. We need to fix the caller to check the return code too.
8 8
9RP 2014/6/10 9RP 2014/6/10
10 10
11Upstream-Status: Pending 11Upstream-Status: Submitted [RPM5 maintainer]
12 12
13Index: rpm-5.4.14/lib/fsm.c 13Index: rpm-5.4.14/lib/fsm.c
14=================================================================== 14===================================================================
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch b/meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch
index e99fd1c3bc..72884d4ad4 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch
@@ -1,6 +1,6 @@
1rpm - rpmio/keccak.c: make SSE/MMX dependent upon gcc config 1rpm - rpmio/keccak.c: make SSE/MMX dependent upon gcc config
2 2
3Upstream-Status: Pending 3Upstream-Status: Submitted [RPM5 maintainer]
4 4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 6
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
20else comparison the system will now perform a 'last-in-wins' resolution when 20else comparison the system will now perform a 'last-in-wins' resolution when
21"neither is preferred". 21"neither is preferred".
22 22
23Upstream-Status: Pending 23Upstream-Status: Submitted [RPM5 maintainer]
24 24
25Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 25Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
26Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 26Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
index 042e412ede..e87e02b69b 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
@@ -2,7 +2,7 @@ During installation, the libtool relink attempts to link to -lrpm...
2The problem is that it hasn't been installed yet! So small change causes 2The problem is that it hasn't been installed yet! So small change causes
3the libtool to instead use the build version. 3the libtool to instead use the build version.
4 4
5Upstream-Status: Pending 5Upstream-Status: Submitted [RPM5 maintainer]
6 6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8 8
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch b/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch
index 790a662170..a87518ba3a 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch
@@ -5,7 +5,7 @@ appears to be invalid. Instead of relying solely on the platform comparison
5we also want to generate a perceived platform based on the valid rpm contents 5we also want to generate a perceived platform based on the valid rpm contents
6of arch and os. 6of arch and os.
7 7
8Upstream-Status: Pending 8Upstream-Status: Submitted [RPM5 maintainer]
9 9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11 11
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch b/meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch
index 9e324e5c8a..6c3e4718b9 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch
@@ -1,6 +1,6 @@
1Fix errors when building with sasl2 disabled 1Fix errors when building with sasl2 disabled
2 2
3Upstream-Status: Pending 3Upstream-Status: Submitted [RPM5 maintainer]
4 4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 6
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
index ab6ed2c3a4..e58cc13a6f 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
@@ -1,6 +1,6 @@
1lib/order.c: Make the dependency loop messages into debug msgs 1lib/order.c: Make the dependency loop messages into debug msgs
2 2
3Upstream-Status: Pending 3Upstream-Status: Submitted [RPM5 maintainer]
4 4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 6
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-opendb-before-verifyscript-to-avoid-null-point.patch b/meta/recipes-devtools/rpm/rpm/rpm-opendb-before-verifyscript-to-avoid-null-point.patch
index 07d586a3ab..e2191245f8 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-opendb-before-verifyscript-to-avoid-null-point.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-opendb-before-verifyscript-to-avoid-null-point.patch
@@ -6,7 +6,7 @@ rpmpsmStage function(rpmVerifyScript->rpmpsmScriptStage->rpmpsmStage) and occur
6fault because of null point(rpmtsGetRdb(ts) == NULL and rpmtsGetRdb(ts)->db_txn). 6fault because of null point(rpmtsGetRdb(ts) == NULL and rpmtsGetRdb(ts)->db_txn).
7So we open rpmdb to avoid bad input when find headerIsEntry true. 7So we open rpmdb to avoid bad input when find headerIsEntry true.
8 8
9Upstream-Status: Pending 9Upstream-Status: Submitted [RPM5 maintainer]
10 10
11Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> 11Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
12Index: rpm-5.4.14/lib/verify.c 12Index: rpm-5.4.14/lib/verify.c
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
index c15e12405d..57fc6ce88c 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
@@ -2,7 +2,7 @@ Add the ability to query the packageorigin
2 2
3Written by jbj at rpm5.org 3Written by jbj at rpm5.org
4 4
5Upstream-Status: Inappropriate [not author] 5Upstream-Status: Submitted [RPM5 maintainer]
6 6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8 8
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch b/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch
index 47470d23a0..af643b1c62 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch
@@ -17,7 +17,7 @@ Patch taken from http://git.pld-linux.org/?p=packages/rpm.git;a=commitdiff;h=105
17 17
18RP 2014/6/10 18RP 2014/6/10
19 19
20Upstream-Status: Pending 20Upstream-Status: Submitted [RPM5 maintainer]
21 21
22Index: rpm-5.4.14/build/files.c 22Index: rpm-5.4.14/build/files.c
23=================================================================== 23===================================================================
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
index f26a6e79da..200964f39d 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
@@ -2,7 +2,7 @@ Don't add the first line of /etc/rpm/platform to the list of patterns
2to match when computing an arch score, use it just for getting 2to match when computing an arch score, use it just for getting
3information about the platform (cpu/vendor/os). Fixes #3864. 3information about the platform (cpu/vendor/os). Fixes #3864.
4 4
5Upstream-Status: Inappropriate [embedded specific] 5Upstream-Status: Submitted [RPM5 maintainer]
6 6
7Index: rpm-5.4.14/lib/rpmrc.c 7Index: rpm-5.4.14/lib/rpmrc.c
8=================================================================== 8===================================================================
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
index 11fd039036..3b40fea0eb 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
@@ -1,6 +1,6 @@
1Fix up platform and related sysinfo file loading. 1Fix up platform and related sysinfo file loading.
2 2
3Upstream-Status: Pending 3Upstream-Status: Submitted [RPM5 maintainer]
4 4
5This ensures that RPM knows the compatible set of package types at all times. 5This ensures that RPM knows the compatible set of package types at all times.
6 6
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
index fed54e5f11..b9675c71be 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
@@ -1,7 +1,5 @@
1Fix up platform and related sysinfo file loading (part 2). 1Fix up platform and related sysinfo file loading (part 2).
2 2
3Upstream-Status: Pending
4
5We need to ensure that we set the _gnu flag somehow. We do this by reading 3We need to ensure that we set the _gnu flag somehow. We do this by reading
6from the platform file, and setting a new _platform_gnu and related vars. 4from the platform file, and setting a new _platform_gnu and related vars.
7 5
@@ -11,6 +9,8 @@ values. The macros file uses the configure time defaults in _platform_...
11versions have not been defined. This preserves existing behavior, but 9versions have not been defined. This preserves existing behavior, but
12ensures reasonable defaults are always available. 10ensures reasonable defaults are always available.
13 11
12Upstream-Status: Submitted [RPM5 maintainer]
13
14Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 14Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15 15
16Index: rpm-5.4.14/lib/rpmrc.c 16Index: rpm-5.4.14/lib/rpmrc.c
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch b/meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch
index e6aff52f8c..7a473db1ad 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch
@@ -2,7 +2,7 @@ Fix an issue where the PACKAGEORIGIN is not properly stored.
2 2
3Restore the rpmtsCallback fdSetOpen call and related code. 3Restore the rpmtsCallback fdSetOpen call and related code.
4 4
5Upstream-Status: Pending 5Upstream-Status: Submitted [RPM5 maintainer]
6 6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8 8
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch b/meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch
index ed7f8ccaff..dfb551377e 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch
@@ -5,7 +5,7 @@ tag. Without this, any custom tag extensions will be returned in a format
5that the tagNumFromPyObject and related functions like hdr_subscript will 5that the tagNumFromPyObject and related functions like hdr_subscript will
6failed to process. Usually the failure is error: expected a string or integer 6failed to process. Usually the failure is error: expected a string or integer
7 7
8Upstream-Status: Pending 8Upstream-Status: Submitted [RPM5 maintainer]
9 9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11 11
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
index 56a243d5f7..526106d1e3 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
@@ -3,7 +3,7 @@ lib/rpmts.c: Ensure that we check both providename and filepaths
3When looking up a missing dependencies, such as /bin/sh, we need to lookup 3When looking up a missing dependencies, such as /bin/sh, we need to lookup
4in both the providename and filepaths DB, not just the filepaths DB. 4in both the providename and filepaths DB, not just the filepaths DB.
5 5
6Upstream-Status: Pending 6Upstream-Status: Submitted [RPM5 maintainer]
7 7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9 9
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch b/meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch
index a5165742ff..b9a2cbce25 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch
@@ -9,7 +9,7 @@ getent: ELF 32-bit MSB executable, MIPS, N32 MIPS64 [snip]
9 9
10And "rpm -qp --filecolor" was wrong (it was 1, but should be 4). 10And "rpm -qp --filecolor" was wrong (it was 1, but should be 4).
11 11
12Upstream-Status: Pending 12Upstream-Status: Submitted [RPM5 maintainer]
13 13
14Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 14Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15--- 15---
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch b/meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch
index 49cdfcaf9d..93645766c2 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch
@@ -1,6 +1,6 @@
1Fix a typo in the rpmio Makefile.am 1Fix a typo in the rpmio Makefile.am
2 2
3Upstream-Status: Pending 3Upstream-Status: Submitted [RPM5 maintainer]
4 4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 6
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch
index 683275cb18..5fb40b6fef 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch
@@ -6,7 +6,7 @@ when the generating process is executed on different architectures.
6 6
7This patch resolves it by taking the byte order that host uses. 7This patch resolves it by taking the byte order that host uses.
8 8
9Upstream-Status: Pending 9Upstream-Status: Submitted [RPM5 maintainer]
10 10
11Signed-off-by: Ming Liu <ming.liu@windriver.com> 11Signed-off-by: Ming Liu <ming.liu@windriver.com>
12--- 12---
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch b/meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch
index 786944d847..9eb675ba29 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch
@@ -5,7 +5,7 @@ special 'filenames' item is value. This adds a similar patch to the
5_tagType to return the proper type, otherwise it comes back as a simple 5_tagType to return the proper type, otherwise it comes back as a simple
6RPM_STRING_ARRAY_TYPE which limits the response to the first element. 6RPM_STRING_ARRAY_TYPE which limits the response to the first element.
7 7
8Upstream-Status: Pending 8Upstream-Status: Submitted [RPM5 maintainer]
9 9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11 11
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch b/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
index cb85bebfc0..72d3509291 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
@@ -1,5 +1,5 @@
1Source: None 1Source: None
2Upstream-Status: Pending 2Upstream-Status: Submitted [RPM5 maintainer]
3Author: Khem Raj <raj.khem@gmail.com> 3Author: Khem Raj <raj.khem@gmail.com>
4Date: 2011-03-03 4Date: 2011-03-03
5Description: 5Description:
diff --git a/meta/recipes-devtools/rpm/rpm/rpmatch.patch b/meta/recipes-devtools/rpm/rpm/rpmatch.patch
index 2ededdac4a..9bbf580e46 100644
--- a/meta/recipes-devtools/rpm/rpm/rpmatch.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpmatch.patch
@@ -5,7 +5,7 @@ This uses an existing configure check.
5This is needed for uclibc since it does not have the above function 5This is needed for uclibc since it does not have the above function
6implemented. 6implemented.
7 7
8Upstream-Status: Pending 8Upstream-Status: Submitted [RPM5 maintainer]
9 9
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 11
diff --git a/meta/recipes-devtools/rpm/rpm/uclibc-support.patch b/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
index 3b4b924510..dc7b0488a5 100644
--- a/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
+++ b/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
@@ -1,6 +1,6 @@
1Define the x* wrappers for uclibc as well 1Define the x* wrappers for uclibc as well
2 2
3Upstream-Status: Pending 3Upstream-Status: Submitted [RPM5 maintainer]
4 4
5Signed-off-by: Khem Raj <raj.khem@gmail.com> 5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6 6