diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-12-04 10:49:30 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 12:31:04 +0000 |
| commit | a8cee41b3dcdecb45adbfebe96918f7d984b39ca (patch) | |
| tree | 841790d7fa348bba8cd1faabc8c42b4030b1d92f | |
| parent | f47fa1a8c0e76ca1b72091fefa8e59af09f5c501 (diff) | |
| download | poky-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>
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 | |||
| 4 | want to see the MISSINGOK value so we can avoid recommended packages causing | 4 | want to see the MISSINGOK value so we can avoid recommended packages causing |
| 5 | failures. | 5 | failures. |
| 6 | 6 | ||
| 7 | Upstream-status: Pending | 7 | Upstream-Status: Pending |
| 8 | 8 | ||
| 9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 9 | Signed-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 | |||
| 14 | a basic retry and success message is added to show that the failure was | 14 | a basic retry and success message is added to show that the failure was |
| 15 | resolved. | 15 | resolved. |
| 16 | 16 | ||
| 17 | Upstream-status: Inappropriate (workaround) | 17 | Upstream-Status: Inappropriate (workaround) |
| 18 | 18 | ||
| 19 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 19 | Signed-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 | ||
| 3 | Patch taken from the cvs repo,http://www.mail-archive.com/rpm-cvs@rpm5.org/msg08907.html. | 3 | Patch taken from the cvs repo,http://www.mail-archive.com/rpm-cvs@rpm5.org/msg08907.html. |
| 4 | 4 | ||
| 5 | Upstream-status: Backport | 5 | Upstream-Status: Backport |
| 6 | 6 | ||
| 7 | Signed-off-by: Morgan Little <morgan.little@windriver.com> | 7 | Signed-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. | |||
| 7 | The recipe already depends on ossp so ossp/uuid.h will be there when rpm-native | 7 | The recipe already depends on ossp so ossp/uuid.h will be there when rpm-native |
| 8 | is built. | 8 | is built. |
| 9 | 9 | ||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 10 | Signed-off-by: Morgan Little <morgan.little@windriver.com> | 12 | Signed-off-by: Morgan Little <morgan.little@windriver.com> |
| 11 | 13 | ||
| 12 | 14 | ||