summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-05-16 03:04:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 14:14:42 (GMT)
commit0dbd791e5b837a096f020635c773715bae7b15f5 (patch)
treecfd36b0aea7c5099d19c1f1a2d7c33557ffdf184
parent9e45491318ea7facbf1f517250e22f701245bba6 (diff)
downloadpoky-0dbd791e5b837a096f020635c773715bae7b15f5.tar.gz
recipes: Add Upstream-Status to various recipe patches
Add Upstream-Status tag to patches for the following recipes: openssh dbus-glib expat opensp sgml-common at cpio (GPLv3 version) libpam icu (From OE-Core rev: 0702602332ad63c2cfaa207516497bb0b75bfdf3) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch9
-rw-r--r--meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch9
-rw-r--r--meta/recipes-core/expat/expat-2.0.1/autotools.patch10
-rw-r--r--meta/recipes-devtools/opensp/opensp/attributevalue.patch3
-rw-r--r--meta/recipes-devtools/opensp/opensp/fix-docdir.patch3
-rw-r--r--meta/recipes-devtools/opensp/opensp/m4.patch3
-rw-r--r--meta/recipes-devtools/opensp/opensp/rangmap-fix.patch3
-rw-r--r--meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch3
-rw-r--r--meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch3
-rw-r--r--meta/recipes-extended/at/at-3.1.12/configure.patch8
-rw-r--r--meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch4
-rw-r--r--meta/recipes-extended/cpio/cpio-2.11/statdef.patch8
-rw-r--r--meta/recipes-extended/pam/libpam/pam-no-innetgr.patch5
-rw-r--r--meta/recipes-extended/sudo/files/libtool.patch10
-rw-r--r--meta/recipes-support/icu/files/gccfix.patch6
-rw-r--r--meta/recipes-support/icu/files/noldlibpath.patch5
-rw-r--r--meta/recipes-support/icu/files/use-g++-for-linking.patch7
17 files changed, 83 insertions, 16 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch b/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch
index a88e18e..7970b6d 100644
--- a/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch
+++ b/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch
@@ -1,6 +1,9 @@
1# Disable stripping binaries during make install. 1Disable stripping binaries during make install.
2# 2
3# Signed-off-by: Scott Garman <scott.a.garman@intel.com> 3Upstream-Status: Inappropriate [Other]
4Build system specific.
5
6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4 7
5diff -ur openssh-5.6p1.orig/Makefile.in openssh-5.6p1/Makefile.in 8diff -ur openssh-5.6p1.orig/Makefile.in openssh-5.6p1/Makefile.in
6--- openssh-5.6p1.orig/Makefile.in 2010-05-11 23:51:39.000000000 -0700 9--- openssh-5.6p1.orig/Makefile.in 2010-05-11 23:51:39.000000000 -0700
diff --git a/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch
index 32609b9..fbb4967 100644
--- a/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch
+++ b/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch
@@ -1,6 +1,9 @@
1# disable compiling examples 1Disable compiling examples
2# 2
3# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-10 3Upstream-Status: Inappropriate [disable feature]
4
5Signed-off-by: Kevin Tian <kevin.tian@intel.com>
6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4 7
5--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 8--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200
6+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 9+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200
diff --git a/meta/recipes-core/expat/expat-2.0.1/autotools.patch b/meta/recipes-core/expat/expat-2.0.1/autotools.patch
index ff1578f..c0ac10b 100644
--- a/meta/recipes-core/expat/expat-2.0.1/autotools.patch
+++ b/meta/recipes-core/expat/expat-2.0.1/autotools.patch
@@ -1,6 +1,10 @@
1# avoid to use expat's own *.m4 1Avoid using expat's m4 files
2# 2
3# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-07 3Upstream-Status: Inappropriate [Other]
4Workaround specific to our build system.
5
6Signed-off-by: Kevin Tian <kevin.tian@intel.com>
7Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4 8
5diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in 9diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in
6--- expat-2.0.0~orig/configure.in 2006-01-10 19:10:46.000000000 -0600 10--- expat-2.0.0~orig/configure.in 2006-01-10 19:10:46.000000000 -0600
diff --git a/meta/recipes-devtools/opensp/opensp/attributevalue.patch b/meta/recipes-devtools/opensp/opensp/attributevalue.patch
index 4f3507e..92f5898 100644
--- a/meta/recipes-devtools/opensp/opensp/attributevalue.patch
+++ b/meta/recipes-devtools/opensp/opensp/attributevalue.patch
@@ -1,6 +1,9 @@
1Patch obtained from OpenEmbedded. 1Patch obtained from OpenEmbedded.
2 2
3Upstream-Status: Pending
4
3Signed-off-by: Scott Garman <scott.a.garman@intel.com> 5Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6
4--- OpenSP-1.5/include/Attribute.h~attributevalue 2000-03-09 13:30:56.000000000 -0500 7--- OpenSP-1.5/include/Attribute.h~attributevalue 2000-03-09 13:30:56.000000000 -0500
5+++ OpenSP-1.5/include/Attribute.h 2004-01-20 14:11:36.000000000 -0500 8+++ OpenSP-1.5/include/Attribute.h 2004-01-20 14:11:36.000000000 -0500
6@@ -31,6 +31,28 @@ 9@@ -31,6 +31,28 @@
diff --git a/meta/recipes-devtools/opensp/opensp/fix-docdir.patch b/meta/recipes-devtools/opensp/opensp/fix-docdir.patch
index 5e2fc8b..c78b9ad 100644
--- a/meta/recipes-devtools/opensp/opensp/fix-docdir.patch
+++ b/meta/recipes-devtools/opensp/opensp/fix-docdir.patch
@@ -1,6 +1,9 @@
1Patch obtained from OpenEmbedded. 1Patch obtained from OpenEmbedded.
2 2
3Upstream-Status: Pending
4
3Signed-off-by: Scott Garman <scott.a.garman@intel.com> 5Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6
4Index: OpenSP-1.5/doc/Makefile.am 7Index: OpenSP-1.5/doc/Makefile.am
5=================================================================== 8===================================================================
6--- OpenSP-1.5.orig/doc/Makefile.am 2000-05-06 09:10:32.000000000 +1000 9--- OpenSP-1.5.orig/doc/Makefile.am 2000-05-06 09:10:32.000000000 +1000
diff --git a/meta/recipes-devtools/opensp/opensp/m4.patch b/meta/recipes-devtools/opensp/opensp/m4.patch
index a8504c5..96a782c 100644
--- a/meta/recipes-devtools/opensp/opensp/m4.patch
+++ b/meta/recipes-devtools/opensp/opensp/m4.patch
@@ -1,6 +1,9 @@
1Patch obtained from OpenEmbedded. 1Patch obtained from OpenEmbedded.
2 2
3Upstream-Status: Pending
4
3Signed-off-by: Scott Garman <scott.a.garman@intel.com> 5Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6
4--- /dev/null 2003-09-23 18:19:32.000000000 -0400 7--- /dev/null 2003-09-23 18:19:32.000000000 -0400
5+++ OpenSP-1.5/m4/codeset.m4 2004-01-20 03:01:28.000000000 -0500 8+++ OpenSP-1.5/m4/codeset.m4 2004-01-20 03:01:28.000000000 -0500
6@@ -0,0 +1,23 @@ 9@@ -0,0 +1,23 @@
diff --git a/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch b/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch
index cc849ca..da31411 100644
--- a/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch
+++ b/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch
@@ -1,6 +1,9 @@
1Patch obtained from OpenEmbedded. 1Patch obtained from OpenEmbedded.
2 2
3Upstream-Status: Pending
4
3Signed-off-by: Scott Garman <scott.a.garman@intel.com> 5Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6
4Index: OpenSP-1.5/include/RangeMap.cxx 7Index: OpenSP-1.5/include/RangeMap.cxx
5=================================================================== 8===================================================================
6--- OpenSP-1.5.orig/include/RangeMap.cxx 2000-02-26 03:55:21.000000000 +1100 9--- OpenSP-1.5.orig/include/RangeMap.cxx 2000-02-26 03:55:21.000000000 +1100
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch
index 1366ada..1f39b03 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch
+++ b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch
@@ -1,6 +1,9 @@
1Patch obtained from OpenEmbedded. 1Patch obtained from OpenEmbedded.
2 2
3Upstream-Status: Pending
4
3Signed-off-by: Scott Garman <scott.a.garman@intel.com> 5Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6
4--- sgml-common-0.6.3/bin/Makefile.am~autohell.patch 2001-01-30 15:42:21.000000000 +0100 7--- sgml-common-0.6.3/bin/Makefile.am~autohell.patch 2001-01-30 15:42:21.000000000 +0100
5+++ sgml-common-0.6.3/bin/Makefile.am 2004-06-17 11:51:11.000000000 +0200 8+++ sgml-common-0.6.3/bin/Makefile.am 2004-06-17 11:51:11.000000000 +0200
6@@ -1,6 +1,5 @@ 9@@ -1,6 +1,5 @@
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch
index ec66aae..54b3f54 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch
+++ b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch
@@ -7,7 +7,10 @@ Upstream was notified about this on 2011-01-24. When upgrading
7this recipe, this should be fixed and you should remove this 7this recipe, this should be fixed and you should remove this
8patch. 8patch.
9 9
10Upstream-Status: Pending
11
10Signed-off-by: Scott Garman <scott.a.garman@intel.com> 12Signed-off-by: Scott Garman <scott.a.garman@intel.com>
13
11diff -urN sgml-common-0.6.3.orig/LICENSE-GPLv2 sgml-common-0.6.3/LICENSE-GPLv2 14diff -urN sgml-common-0.6.3.orig/LICENSE-GPLv2 sgml-common-0.6.3/LICENSE-GPLv2
12--- sgml-common-0.6.3.orig/LICENSE-GPLv2 1969-12-31 16:00:00.000000000 -0800 15--- sgml-common-0.6.3.orig/LICENSE-GPLv2 1969-12-31 16:00:00.000000000 -0800
13+++ sgml-common-0.6.3/LICENSE-GPLv2 2011-01-28 17:05:17.299528001 -0800 16+++ sgml-common-0.6.3/LICENSE-GPLv2 2011-01-28 17:05:17.299528001 -0800
diff --git a/meta/recipes-extended/at/at-3.1.12/configure.patch b/meta/recipes-extended/at/at-3.1.12/configure.patch
index 2458ef3..079a6b4 100644
--- a/meta/recipes-extended/at/at-3.1.12/configure.patch
+++ b/meta/recipes-extended/at/at-3.1.12/configure.patch
@@ -1,5 +1,9 @@
1# Fix cross-compilation issues in configure.ac 1Fix cross-compilation issues in configure.ac
2# Derived from an OE patch for at-3.1.8 2Derived from an OE patch for at-3.1.8
3
4Upstream-Status: Pending
5
6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
3 7
4Index: at-3.1.12/configure.ac 8Index: at-3.1.12/configure.ac
5=================================================================== 9===================================================================
diff --git a/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch b/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch
index 6383660..877be35 100644
--- a/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch
+++ b/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch
@@ -9,6 +9,10 @@ Fixed the issue by adding a dependancy in the makefile.
9Nitin <nitin.a.kamble@intel.com> 9Nitin <nitin.a.kamble@intel.com>
102010/09/02 102010/09/02
11 11
12Upstream-Status: Pending
13
14Signed-off-by: Scott Garman <scott.a.garman@intel.com>
15
12Index: at-3.1.12/Makefile.in 16Index: at-3.1.12/Makefile.in
13=================================================================== 17===================================================================
14--- at-3.1.12.orig/Makefile.in 18--- at-3.1.12.orig/Makefile.in
diff --git a/meta/recipes-extended/cpio/cpio-2.11/statdef.patch b/meta/recipes-extended/cpio/cpio-2.11/statdef.patch
index dfa0d91..a6b8e82 100644
--- a/meta/recipes-extended/cpio/cpio-2.11/statdef.patch
+++ b/meta/recipes-extended/cpio/cpio-2.11/statdef.patch
@@ -1,5 +1,9 @@
1# Avoid multiple stat definitions 1Avoid multiple stat definitions
2# Patch taken from cpio mailing list posting 2010-03-19 2Patch taken from cpio mailing list posting 2010-03-19
3
4Upstream-Status: Pending
5
6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
3 7
4diff -urN cpio-2.11.orig/src/filetypes.h cpio-2.11/src/filetypes.h 8diff -urN cpio-2.11.orig/src/filetypes.h cpio-2.11/src/filetypes.h
5--- cpio-2.11.orig/src/filetypes.h 2010-02-12 02:19:23.000000000 -0800 9--- cpio-2.11.orig/src/filetypes.h 2010-02-12 02:19:23.000000000 -0800
diff --git a/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch b/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
index e622a0d..5e551ac 100644
--- a/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
+++ b/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
@@ -2,6 +2,11 @@ innetgr may not be there so make sure that when innetgr is not present
2then we inform about it and not use it. 2then we inform about it and not use it.
3 3
4-Khem 4-Khem
5
6Upstream-Status: Pending
7
8Signed-off-by: Scott Garman <scott.a.garman@intel.com>
9
5Index: Linux-PAM-1.1.3/modules/pam_group/pam_group.c 10Index: Linux-PAM-1.1.3/modules/pam_group/pam_group.c
6=================================================================== 11===================================================================
7--- Linux-PAM-1.1.3.orig/modules/pam_group/pam_group.c 12--- Linux-PAM-1.1.3.orig/modules/pam_group/pam_group.c
diff --git a/meta/recipes-extended/sudo/files/libtool.patch b/meta/recipes-extended/sudo/files/libtool.patch
index 2375fc6..22fda53 100644
--- a/meta/recipes-extended/sudo/files/libtool.patch
+++ b/meta/recipes-extended/sudo/files/libtool.patch
@@ -1,6 +1,10 @@
1# Fix path to libtool scripts so autoreconf can succeed. 1Fix path to libtool scripts so autoreconf can succeed.
2# 2
3# Signed-off-by: Scott Garman <scott.a.garman@intel.com> 3Upstream-Status: Inappropriate [Other]
4Workaround specific to our build system.
5
6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
7
4diff -urN sudo-1.7.4p4.orig//aclocal.m4 sudo-1.7.4p4//aclocal.m4 8diff -urN sudo-1.7.4p4.orig//aclocal.m4 sudo-1.7.4p4//aclocal.m4
5--- sudo-1.7.4p4.orig//aclocal.m4 2010-08-06 07:17:36.000000000 -0700 9--- sudo-1.7.4p4.orig//aclocal.m4 2010-08-06 07:17:36.000000000 -0700
6+++ sudo-1.7.4p4//aclocal.m4 2010-11-22 14:38:20.360957038 -0800 10+++ sudo-1.7.4p4//aclocal.m4 2010-11-22 14:38:20.360957038 -0800
diff --git a/meta/recipes-support/icu/files/gccfix.patch b/meta/recipes-support/icu/files/gccfix.patch
index 9291e92..755341f 100644
--- a/meta/recipes-support/icu/files/gccfix.patch
+++ b/meta/recipes-support/icu/files/gccfix.patch
@@ -1,3 +1,9 @@
1Fixes an error which prevents compilation
2
3Upstream-Status: Pending
4
5Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6
1Index: source/layoutex/ParagraphLayout.cpp 7Index: source/layoutex/ParagraphLayout.cpp
2=================================================================== 8===================================================================
3--- source.orig/layoutex/ParagraphLayout.cpp 2009-06-30 11:48:47.000000000 +0100 9--- source.orig/layoutex/ParagraphLayout.cpp 2009-06-30 11:48:47.000000000 +0100
diff --git a/meta/recipes-support/icu/files/noldlibpath.patch b/meta/recipes-support/icu/files/noldlibpath.patch
index eba3d80..8543044 100644
--- a/meta/recipes-support/icu/files/noldlibpath.patch
+++ b/meta/recipes-support/icu/files/noldlibpath.patch
@@ -4,6 +4,11 @@ harmless. This is a hack.
4 4
5RP 10/6/2010 5RP 10/6/2010
6 6
7Upstream-Status: Inappropriate [Other]
8Hacky workaround not likely to be accepted upstream.
9
10Signed-off-by: Scott Garman <scott.a.garman@intel.com>
11
7Index: source/config/Makefile.inc.in 12Index: source/config/Makefile.inc.in
8=================================================================== 13===================================================================
9--- source.orig/config/Makefile.inc.in 2010-06-10 21:49:19.000000000 +0100 14--- source.orig/config/Makefile.inc.in 2010-06-10 21:49:19.000000000 +0100
diff --git a/meta/recipes-support/icu/files/use-g++-for-linking.patch b/meta/recipes-support/icu/files/use-g++-for-linking.patch
index 4702abc..f477dad 100644
--- a/meta/recipes-support/icu/files/use-g++-for-linking.patch
+++ b/meta/recipes-support/icu/files/use-g++-for-linking.patch
@@ -1,3 +1,10 @@
1Use g++ for linking.
2
3Upstream-Status: Inappropriate [Other]
4Build system specific
5
6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
7
1--- 8---
2 tools/genccode/Makefile.in | 2 +- 9 tools/genccode/Makefile.in | 2 +-
3 tools/gencmn/Makefile.in | 2 +- 10 tools/gencmn/Makefile.in | 2 +-