diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-07-24 15:21:39 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-26 14:40:49 +0100 |
commit | 18de2330238f29c0264b13ab3ec681bbc2e25ef6 (patch) | |
tree | a71027a733c8b569fe6ea04c1a6c879c8b982e13 /meta/recipes-devtools/rpm/rpm | |
parent | 2ccbf35ed1de1e0c1a412d6366c1b1f7fe12c23a (diff) | |
download | poky-18de2330238f29c0264b13ab3ec681bbc2e25ef6.tar.gz |
Add missing Upstream-Status to various patches.
(From OE-Core rev: 951e9caac62a4de576e4003319101e8ff59d72d9)
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')
7 files changed, 14 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch index 980e1b1476..348a9198dd 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch | |||
@@ -1,5 +1,7 @@ | |||
1 | Add support for cross compiling lua | 1 | Add support for cross compiling lua |
2 | 2 | ||
3 | Upstream-Status: Pending | ||
4 | |||
3 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
4 | 6 | ||
5 | diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac | 7 | diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac |
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch index f25656a23d..c1516a422a 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch | |||
@@ -3,6 +3,8 @@ macros/macros.in: Revert settings to the same as RPM 5.4.0 | |||
3 | Enable a reasonable set of rpmdeps dependency helper macros. These sets | 3 | Enable a reasonable set of rpmdeps dependency helper macros. These sets |
4 | were used by RPM 5.4.0. | 4 | were used by RPM 5.4.0. |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
6 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
7 | 9 | ||
8 | diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in | 10 | diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in |
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch index 90fee35dce..442afbc43b 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch | |||
@@ -5,6 +5,8 @@ This causes a configure failure when perl-URPM is not used. | |||
5 | | configure.ac:1159: required file `perl-URPM/Makefile.PL.in' not found | 5 | | configure.ac:1159: required file `perl-URPM/Makefile.PL.in' not found |
6 | | configure.ac:1159: required file `perl-URPM/Makefile.in' not found | 6 | | configure.ac:1159: required file `perl-URPM/Makefile.in' not found |
7 | 7 | ||
8 | Upstream-Status: Inappropriate [disable feature] | ||
9 | |||
8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
9 | 11 | ||
10 | --- rpm-5.4.8/configure.ac.orig 2012-04-24 09:10:01.856749153 -0500 | 12 | --- rpm-5.4.8/configure.ac.orig 2012-04-24 09:10:01.856749153 -0500 |
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch index 1f4ba980b1..db424b8493 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch | |||
@@ -4,6 +4,8 @@ We need to avoid including the util-linux uuid library, instead | |||
4 | we need ossp-uuid. There is a related hack in do_configure to | 4 | we need ossp-uuid. There is a related hack in do_configure to |
5 | make sure that we use the right .pc file as well. | 5 | make sure that we use the right .pc file as well. |
6 | 6 | ||
7 | Upstream-Status: Inappropriate [disable feature] | ||
8 | |||
7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
8 | 10 | ||
9 | diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac | 11 | diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac |
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch index 3c6dad4d50..7e090a3442 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch | |||
@@ -2,6 +2,8 @@ Add the ability to query the packageorigin | |||
2 | 2 | ||
3 | Written by jbj at rpm5.org | 3 | Written by jbj at rpm5.org |
4 | 4 | ||
5 | Upstream-Status: Inappropriate [not author] | ||
6 | |||
5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
6 | 8 | ||
7 | Index: rpm-5.4.8/rpmdb/hdrfmt.c | 9 | Index: rpm-5.4.8/rpmdb/hdrfmt.c |
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch index 4aba400602..f192545abb 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch | |||
@@ -5,6 +5,8 @@ we don't want this as it may lead to inaccurate results in some corner cases. | |||
5 | 5 | ||
6 | PKG_CONFIG_LIBDIR will ensure pkg-config stays within the install directory. | 6 | PKG_CONFIG_LIBDIR will ensure pkg-config stays within the install directory. |
7 | 7 | ||
8 | Upstream-Status: Inappropriate [configuration] | ||
9 | |||
8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
9 | 11 | ||
10 | diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh | 12 | diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh |
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch index 8c01a30651..d272fe9cff 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | |||
@@ -3,6 +3,8 @@ lib/rpmts.c: Ensure that we check both providename and filepaths | |||
3 | When looking up a missing dependencies, such as /bin/sh, we need to lookup | 3 | When looking up a missing dependencies, such as /bin/sh, we need to lookup |
4 | in both the providename and filepaths DB, not just the filepaths DB. | 4 | in both the providename and filepaths DB, not just the filepaths DB. |
5 | 5 | ||
6 | Upstream-Status: Pending | ||
7 | |||
6 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
7 | 9 | ||
8 | --- rpm-5.4.0.orig/lib/rpmts.c 2010-12-27 16:08:25.000000000 -0600 | 10 | --- rpm-5.4.0.orig/lib/rpmts.c 2010-12-27 16:08:25.000000000 -0600 |