From 951e9caac62a4de576e4003319101e8ff59d72d9 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 24 Jul 2012 15:21:39 -0500 Subject: Add missing Upstream-Status to various patches. Signed-off-by: Mark Hatle --- meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch | 4 ++++ .../ossp-uuid/ossp-uuid/0001-Change-library-name.patch | 7 +++++++ .../0002-uuid-preserve-m-option-status-in-v-option-handling.patch | 7 +++++++ .../ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch | 7 +++++++ .../ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch | 7 +++++++ meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch | 3 +++ meta/recipes-devtools/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 ++ meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch | 2 ++ meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch | 2 ++ meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch | 2 ++ meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch | 2 ++ meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | 2 ++ 14 files changed, 52 insertions(+) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch b/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch index 4ac1a9c981..c95eed6f94 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 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 a46e244c8b..ed67c501cb 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 + 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 1467207f51..804a62731d 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 + 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 060a7540f1..13cbb59896 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 + 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 1f92cea3ae..bc5e111ee5 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 + --- 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 97daca46d1..4bc91b86ee 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 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 78f3c94a55..d806b5fb70 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 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 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 @@ Add support for cross compiling lua +Upstream-Status: Pending + Signed-off-by: Mark Hatle 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 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 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. | 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 --- 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 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 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 Written by jbj at rpm5.org +Upstream-Status: Inappropriate [not author] + Signed-off-by: Mark Hatle 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. PKG_CONFIG_LIBDIR will ensure pkg-config stays within the install directory. +Upstream-Status: Inappropriate [configuration] + Signed-off-by: Mark Hatle 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 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 --- rpm-5.4.0.orig/lib/rpmts.c 2010-12-27 16:08:25.000000000 -0600 -- cgit 1.2.3-korg