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>
This commit is contained in:
parent
2ccbf35ed1
commit
18de233023
|
@ -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
|
was a simple way to add it, as thumb instructions shouldn't be generated by
|
||||||
the compiler anyway.
|
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@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
diff -urN binutils-2.22.orig/gas/config/tc-arm.c binutils-2.22/gas/config/tc-arm.c
|
diff -urN binutils-2.22.orig/gas/config/tc-arm.c binutils-2.22/gas/config/tc-arm.c
|
||||||
|
|
|
@ -12,6 +12,13 @@ uuid library.
|
||||||
uuid.pc.in | 4 ++--
|
uuid.pc.in | 4 ++--
|
||||||
5 files changed, 13 insertions(+), 13 deletions(-)
|
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@windriver.com>
|
||||||
|
|
||||||
diff --git a/Makefile.in b/Makefile.in
|
diff --git a/Makefile.in b/Makefile.in
|
||||||
index d28f4be..c2ba99d 100644
|
index d28f4be..c2ba99d 100644
|
||||||
--- a/Makefile.in
|
--- a/Makefile.in
|
||||||
|
|
|
@ -7,6 +7,13 @@ Bug: 531396
|
||||||
uuid_cli.c | 19 ++++++++++---------
|
uuid_cli.c | 19 ++++++++++---------
|
||||||
1 files changed, 10 insertions(+), 9 deletions(-)
|
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@windriver.com>
|
||||||
|
|
||||||
diff --git a/uuid_cli.c b/uuid_cli.c
|
diff --git a/uuid_cli.c b/uuid_cli.c
|
||||||
index d1b0b11..14a67fe 100644
|
index d1b0b11..14a67fe 100644
|
||||||
--- a/uuid_cli.c
|
--- a/uuid_cli.c
|
||||||
|
|
|
@ -9,6 +9,13 @@ Fix whatis entry of uuid.1, uuid.3ossp and uuid++.3ossp manpages
|
||||||
uuid_cli.pod | 2 +-
|
uuid_cli.pod | 2 +-
|
||||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
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@windriver.com>
|
||||||
|
|
||||||
diff --git a/uuid++.pod b/uuid++.pod
|
diff --git a/uuid++.pod b/uuid++.pod
|
||||||
index 8b5a4b1..89c5efb 100644
|
index 8b5a4b1..89c5efb 100644
|
||||||
--- a/uuid++.pod
|
--- a/uuid++.pod
|
||||||
|
|
|
@ -4,6 +4,13 @@ Bug-Debian: http://bugs.debian.org/635607
|
||||||
|
|
||||||
The module Data::GUID depends on Data::UUID supporting this behaviour.
|
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@windriver.com>
|
||||||
|
|
||||||
--- a/perl/uuid_compat.pm
|
--- a/perl/uuid_compat.pm
|
||||||
+++ b/perl/uuid_compat.pm
|
+++ b/perl/uuid_compat.pm
|
||||||
@@ -93,7 +93,9 @@
|
@@ -93,7 +93,9 @@
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
Remove hardcoded libtool name, fall back to generated name
|
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@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
|
diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
We don't want anything stripped
|
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@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
|
diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
Add support for cross compiling lua
|
Add support for cross compiling lua
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
|
diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
|
||||||
|
|
|
@ -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
|
Enable a reasonable set of rpmdeps dependency helper macros. These sets
|
||||||
were used by RPM 5.4.0.
|
were used by RPM 5.4.0.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in
|
diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in
|
||||||
|
|
|
@ -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.PL.in' not found
|
||||||
| configure.ac:1159: required file `perl-URPM/Makefile.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@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
--- rpm-5.4.8/configure.ac.orig 2012-04-24 09:10:01.856749153 -0500
|
--- rpm-5.4.8/configure.ac.orig 2012-04-24 09:10:01.856749153 -0500
|
||||||
|
|
|
@ -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
|
we need ossp-uuid. There is a related hack in do_configure to
|
||||||
make sure that we use the right .pc file as well.
|
make sure that we use the right .pc file as well.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [disable feature]
|
||||||
|
|
||||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
|
diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
|
||||||
|
|
|
@ -2,6 +2,8 @@ Add the ability to query the packageorigin
|
||||||
|
|
||||||
Written by jbj at rpm5.org
|
Written by jbj at rpm5.org
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [not author]
|
||||||
|
|
||||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
Index: rpm-5.4.8/rpmdb/hdrfmt.c
|
Index: rpm-5.4.8/rpmdb/hdrfmt.c
|
||||||
|
|
|
@ -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.
|
PKG_CONFIG_LIBDIR will ensure pkg-config stays within the install directory.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh
|
diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh
|
||||||
|
|
|
@ -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
|
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.
|
in both the providename and filepaths DB, not just the filepaths DB.
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
--- rpm-5.4.0.orig/lib/rpmts.c 2010-12-27 16:08:25.000000000 -0600
|
--- rpm-5.4.0.orig/lib/rpmts.c 2010-12-27 16:08:25.000000000 -0600
|
||||||
|
|
|
@ -6,6 +6,10 @@ Date: Fri May 11 19:05:09 2012 -0500
|
||||||
|
|
||||||
_RPMVSF_xxx - NODIGEST, NOSIGNATURES, NOHEADER, and NOPAYLOAD
|
_RPMVSF_xxx - NODIGEST, NOSIGNATURES, NOHEADER, and NOPAYLOAD
|
||||||
are now obsolete and no longer supported.
|
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@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
|
|
|
@ -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
|
RPM5 no longer has a switch to disable signature validation. (Due to security
|
||||||
validation concerns.)
|
validation concerns.)
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [other]
|
||||||
|
createrepo does not support RPM5 upstream
|
||||||
|
|
||||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
diff -u createrepo-0.4.11.orig/dumpMetadata.py createrepo-0.4.11/dumpMetadata.py
|
diff -u createrepo-0.4.11.orig/dumpMetadata.py createrepo-0.4.11/dumpMetadata.py
|
||||||
|
|
Loading…
Reference in New Issue