summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-07-24 15:21:39 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-26 14:40:49 +0100
commit18de2330238f29c0264b13ab3ec681bbc2e25ef6 (patch)
treea71027a733c8b569fe6ea04c1a6c879c8b982e13 /meta
parent2ccbf35ed1de1e0c1a412d6366c1b1f7fe12c23a (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch4
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch7
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch7
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch7
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch7
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch3
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch3
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-lua.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-macros.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch2
-rw-r--r--meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch4
-rw-r--r--meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch3
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 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
5was a simple way to add it, as thumb instructions shouldn't be generated by 5was a simple way to add it, as thumb instructions shouldn't be generated by
6the compiler anyway. 6the compiler anyway.
7 7
8Upstream-Status: Denied
9Upstream maintainer indicated that we should not be using armv5e, even though
10it is a legal archicture defined by our gcc.
11
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9 13
10diff -urN binutils-2.22.orig/gas/config/tc-arm.c binutils-2.22/gas/config/tc-arm.c 14diff -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.
12 uuid.pc.in | 4 ++-- 12 uuid.pc.in | 4 ++--
13 5 files changed, 13 insertions(+), 13 deletions(-) 13 5 files changed, 13 insertions(+), 13 deletions(-)
14 14
15----
16Upstream-Status: Inappropriate [not author]
17
18This patch is from debian ossp-uuid 1.6.2 integration.
19
20Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
21
15diff --git a/Makefile.in b/Makefile.in 22diff --git a/Makefile.in b/Makefile.in
16index d28f4be..c2ba99d 100644 23index d28f4be..c2ba99d 100644
17--- a/Makefile.in 24--- 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
7 uuid_cli.c | 19 ++++++++++--------- 7 uuid_cli.c | 19 ++++++++++---------
8 1 files changed, 10 insertions(+), 9 deletions(-) 8 1 files changed, 10 insertions(+), 9 deletions(-)
9 9
10----
11Upstream-Status: Inappropriate [not author]
12
13This patch is from debian ossp-uuid 1.6.2 integration.
14
15Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
16
10diff --git a/uuid_cli.c b/uuid_cli.c 17diff --git a/uuid_cli.c b/uuid_cli.c
11index d1b0b11..14a67fe 100644 18index d1b0b11..14a67fe 100644
12--- a/uuid_cli.c 19--- 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
9 uuid_cli.pod | 2 +- 9 uuid_cli.pod | 2 +-
10 3 files changed, 3 insertions(+), 3 deletions(-) 10 3 files changed, 3 insertions(+), 3 deletions(-)
11 11
12----
13Upstream-Status: Inappropriate [not author]
14
15This patch is from debian ossp-uuid 1.6.2 integration.
16
17Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
18
12diff --git a/uuid++.pod b/uuid++.pod 19diff --git a/uuid++.pod b/uuid++.pod
13index 8b5a4b1..89c5efb 100644 20index 8b5a4b1..89c5efb 100644
14--- a/uuid++.pod 21--- 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
4 4
5The module Data::GUID depends on Data::UUID supporting this behaviour. 5The module Data::GUID depends on Data::UUID supporting this behaviour.
6 6
7----
8Upstream-Status: Inappropriate [not author]
9
10This patch is from debian ossp-uuid 1.6.2 integration.
11
12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
13
7--- a/perl/uuid_compat.pm 14--- a/perl/uuid_compat.pm
8+++ b/perl/uuid_compat.pm 15+++ b/perl/uuid_compat.pm
9@@ -93,7 +93,9 @@ 16@@ -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 @@
1Remove hardcoded libtool name, fall back to generated name 1Remove hardcoded libtool name, fall back to generated name
2 2
3Upstream-Status: Inappropriate [no upstream]
4The project appears to no longer be accepting changes.
5
3Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 6Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
4 7
5diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in 8diff -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 @@
1We don't want anything stripped 1We don't want anything stripped
2 2
3Upstream-Status: Inappropriate [no upstream]
4The project appears to no longer be accepting changes.
5
3Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 6Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
4 7
5diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in 8diff -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 @@
1Add support for cross compiling lua 1Add support for cross compiling lua
2 2
3Upstream-Status: Pending
4
3Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
4 6
5diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac 7diff -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
3Enable a reasonable set of rpmdeps dependency helper macros. These sets 3Enable a reasonable set of rpmdeps dependency helper macros. These sets
4were used by RPM 5.4.0. 4were used by RPM 5.4.0.
5 5
6Upstream-Status: Inappropriate [configuration]
7
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
7 9
8diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in 10diff -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
8Upstream-Status: Inappropriate [disable feature]
9
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 10Signed-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
4we need ossp-uuid. There is a related hack in do_configure to 4we need ossp-uuid. There is a related hack in do_configure to
5make sure that we use the right .pc file as well. 5make sure that we use the right .pc file as well.
6 6
7Upstream-Status: Inappropriate [disable feature]
8
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8 10
9diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac 11diff -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
3Written by jbj at rpm5.org 3Written by jbj at rpm5.org
4 4
5Upstream-Status: Inappropriate [not author]
6
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 8
7Index: rpm-5.4.8/rpmdb/hdrfmt.c 9Index: 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
6PKG_CONFIG_LIBDIR will ensure pkg-config stays within the install directory. 6PKG_CONFIG_LIBDIR will ensure pkg-config stays within the install directory.
7 7
8Upstream-Status: Inappropriate [configuration]
9
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9 11
10diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh 12diff -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
3When looking up a missing dependencies, such as /bin/sh, we need to lookup 3When looking up a missing dependencies, such as /bin/sh, we need to lookup
4in both the providename and filepaths DB, not just the filepaths DB. 4in both the providename and filepaths DB, not just the filepaths DB.
5 5
6Upstream-Status: Pending
7
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 8Signed-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
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
index 8268a2d51d..724428414c 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
6 6
7 _RPMVSF_xxx - NODIGEST, NOSIGNATURES, NOHEADER, and NOPAYLOAD 7 _RPMVSF_xxx - NODIGEST, NOSIGNATURES, NOHEADER, and NOPAYLOAD
8 are now obsolete and no longer supported. 8 are now obsolete and no longer supported.
9
10 Upstream-Status: Inappropriate [other]
11 OE version is too old, when we uprev if this patch is still need it
12 should be sent upstream at that time.
9 13
10 Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 14 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11 15
diff --git a/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch b/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
index 3423c4428c..bc7200d072 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
3RPM5 no longer has a switch to disable signature validation. (Due to security 3RPM5 no longer has a switch to disable signature validation. (Due to security
4validation concerns.) 4validation concerns.)
5 5
6Upstream-Status: Inappropriate [other]
7 createrepo does not support RPM5 upstream
8
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
7 10
8diff -u createrepo-0.4.11.orig/dumpMetadata.py createrepo-0.4.11/dumpMetadata.py 11diff -u createrepo-0.4.11.orig/dumpMetadata.py createrepo-0.4.11/dumpMetadata.py