[OE-core] [PATCH 1/1] Add missing Upstream-Status to various patches.
Mark Hatle
mark.hatle at windriver.com
Tue Jul 24 20:46:01 UTC 2012
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
---
.../binutils/binutils/binutils-armv5e.patch | 4 ++++
.../ossp-uuid/0001-Change-library-name.patch | 7 +++++++
...erve-m-option-status-in-v-option-handling.patch | 7 +++++++
.../ossp-uuid/0003-Fix-whatis-entries.patch | 7 +++++++
.../ossp-uuid/0004-fix-data-uuid-from-string.patch | 7 +++++++
.../ossp-uuid/ossp-uuid/uuid-libtool.patch | 3 +++
.../ossp-uuid/ossp-uuid/uuid-nostrip.patch | 3 +++
meta/recipes-devtools/rpm/rpm/rpm-lua.patch | 2 ++
meta/recipes-devtools/rpm/rpm/rpm-macros.patch | 2 ++
.../rpm/rpm/rpm-no-perl-urpm.patch | 2 ++
meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch | 2 ++
.../rpm/rpm/rpm-packageorigin.patch | 2 ++
.../rpm/rpm/rpm-pkgconfigdeps.patch | 2 ++
meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | 2 ++
.../libzypp/libzypp/libzypp-rpm549.patch | 4 ++++
.../createrepo/createrepo/createrepo-rpm549.patch | 3 +++
16 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch b/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch
index 4ac1a9c..c95eed6 100644
--- a/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch
+++ b/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch
@@ -5,6 +5,10 @@ the support "-march=" settings, but it was lacking the armv5e setting. This
was a simple way to add it, as thumb instructions shouldn't be generated by
the compiler anyway.
+Upstream-Status: Denied
+Upstream maintainer indicated that we should not be using armv5e, even though
+it is a legal archicture defined by our gcc.
+
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
diff -urN binutils-2.22.orig/gas/config/tc-arm.c binutils-2.22/gas/config/tc-arm.c
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
index a46e244..ed67c50 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
@@ -12,6 +12,13 @@ uuid library.
uuid.pc.in | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
+----
+Upstream-Status: Inappropriate [not author]
+
+This patch is from debian ossp-uuid 1.6.2 integration.
+
+Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
+
diff --git a/Makefile.in b/Makefile.in
index d28f4be..c2ba99d 100644
--- a/Makefile.in
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
index 1467207..804a627 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
@@ -7,6 +7,13 @@ Bug: 531396
uuid_cli.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
+----
+Upstream-Status: Inappropriate [not author]
+
+This patch is from debian ossp-uuid 1.6.2 integration.
+
+Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
+
diff --git a/uuid_cli.c b/uuid_cli.c
index d1b0b11..14a67fe 100644
--- a/uuid_cli.c
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
index 060a754..13cbb59 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
@@ -9,6 +9,13 @@ Fix whatis entry of uuid.1, uuid.3ossp and uuid++.3ossp manpages
uuid_cli.pod | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
+----
+Upstream-Status: Inappropriate [not author]
+
+This patch is from debian ossp-uuid 1.6.2 integration.
+
+Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
+
diff --git a/uuid++.pod b/uuid++.pod
index 8b5a4b1..89c5efb 100644
--- a/uuid++.pod
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
index 1f92cea..bc5e111 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
@@ -4,6 +4,13 @@ Bug-Debian: http://bugs.debian.org/635607
The module Data::GUID depends on Data::UUID supporting this behaviour.
+----
+Upstream-Status: Inappropriate [not author]
+
+This patch is from debian ossp-uuid 1.6.2 integration.
+
+Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
+
--- a/perl/uuid_compat.pm
+++ b/perl/uuid_compat.pm
@@ -93,7 +93,9 @@
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
index 97daca4..4bc91b8 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
@@ -1,5 +1,8 @@
Remove hardcoded libtool name, fall back to generated name
+Upstream-Status: Inappropriate [no upstream]
+The project appears to no longer be accepting changes.
+
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
index 78f3c94..d806b5f 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
@@ -1,5 +1,8 @@
We don't want anything stripped
+Upstream-Status: Inappropriate [no upstream]
+The project appears to no longer be accepting changes.
+
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
index 980e1b1..348a919 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
@@ -1,5 +1,7 @@
Add support for cross compiling lua
+Upstream-Status: Pending
+
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
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 f25656a..c1516a4 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
Enable a reasonable set of rpmdeps dependency helper macros. These sets
were used by RPM 5.4.0.
+Upstream-Status: Inappropriate [configuration]
+
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
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 90fee35..442afbc 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.
| configure.ac:1159: required file `perl-URPM/Makefile.PL.in' not found
| configure.ac:1159: required file `perl-URPM/Makefile.in' not found
+Upstream-Status: Inappropriate [disable feature]
+
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
--- 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 1f4ba98..db424b8 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
we need ossp-uuid. There is a related hack in do_configure to
make sure that we use the right .pc file as well.
+Upstream-Status: Inappropriate [disable feature]
+
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
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 3c6dad4..7e090a3 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
Written by jbj at rpm5.org
+Upstream-Status: Inappropriate [not author]
+
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
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 4aba400..f192545 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.
PKG_CONFIG_LIBDIR will ensure pkg-config stays within the install directory.
+Upstream-Status: Inappropriate [configuration]
+
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
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 8c01a30..d272fe9 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
When looking up a missing dependencies, such as /bin/sh, we need to lookup
in both the providename and filepaths DB, not just the filepaths DB.
+Upstream-Status: Pending
+
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
--- rpm-5.4.0.orig/lib/rpmts.c 2010-12-27 16:08:25.000000000 -0600
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
index 8268a2d..7244284 100644
--- a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
+++ b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
@@ -6,6 +6,10 @@ Date: Fri May 11 19:05:09 2012 -0500
_RPMVSF_xxx - NODIGEST, NOSIGNATURES, NOHEADER, and NOPAYLOAD
are now obsolete and no longer supported.
+
+ Upstream-Status: Inappropriate [other]
+ OE version is too old, when we uprev if this patch is still need it
+ should be sent upstream at that time.
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
diff --git a/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch b/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
index 3423c44..bc7200d 100644
--- a/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
+++ b/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
@@ -3,6 +3,9 @@ dumpMetadata.py: Fix for RPM5 - 5.4.9 integration
RPM5 no longer has a switch to disable signature validation. (Due to security
validation concerns.)
+Upstream-Status: Inappropriate [other]
+ createrepo does not support RPM5 upstream
+
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
diff -u createrepo-0.4.11.orig/dumpMetadata.py createrepo-0.4.11/dumpMetadata.py
--
1.7.3.4
More information about the Openembedded-core
mailing list