summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-12-04 10:49:30 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:04 +0000
commita8cee41b3dcdecb45adbfebe96918f7d984b39ca (patch)
tree841790d7fa348bba8cd1faabc8c42b4030b1d92f
parentf47fa1a8c0e76ca1b72091fefa8e59af09f5c501 (diff)
downloadpoky-a8cee41b3dcdecb45adbfebe96918f7d984b39ca.tar.gz
rpm: Fix Upstream-Status fields
(From OE-Core rev: ee65b00b4ce3f4c27c2a19f079576345d39efb22) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch2
4 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
index 61f1e0c69b..0fae571e49 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: Pending
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-db_buffer_small.patch b/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch
index d2ed8534f3..59022f4e63 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch
@@ -14,7 +14,7 @@ If DBI debugging is enabled, additional diagnostics are printed, otherwise
14a basic retry and success message is added to show that the failure was 14a basic retry and success message is added to show that the failure was
15resolved. 15resolved.
16 16
17Upstream-status: Inappropriate (workaround) 17Upstream-Status: Inappropriate (workaround)
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-stub-out-git_strerror.patch b/meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch
index 2cfc163fe1..cbeeb29f52 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch
@@ -2,7 +2,7 @@ git: fix: stud-out git_strerror when --without-git
2 2
3Patch taken from the cvs repo,http://www.mail-archive.com/rpm-cvs@rpm5.org/msg08907.html. 3Patch taken from the cvs repo,http://www.mail-archive.com/rpm-cvs@rpm5.org/msg08907.html.
4 4
5Upstream-status: Backport 5Upstream-Status: Backport
6 6
7Signed-off-by: Morgan Little <morgan.little@windriver.com> 7Signed-off-by: Morgan Little <morgan.little@windriver.com>
8 8
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch b/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
index 0e45ed78ff..600e2c280c 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
@@ -7,6 +7,8 @@ use the one in ossp which solves the issue.
7The recipe already depends on ossp so ossp/uuid.h will be there when rpm-native 7The recipe already depends on ossp so ossp/uuid.h will be there when rpm-native
8is built. 8is built.
9 9
10Upstream-Status: Pending
11
10Signed-off-by: Morgan Little <morgan.little@windriver.com> 12Signed-off-by: Morgan Little <morgan.little@windriver.com>
11 13
12 14