recipes: add Upstream-Status to various recipe patches

Add Upstream-Status tag to patches for the following recipes:

apmd
insserv
linuxdoc-tools
openjade
sgmlspl
at
sudo

Signed-off-by: Scott Garman <scott.a.garman@intel.com>

diff --git a/meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch b/meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch
index 711e77708490ce44138f559d3d01d14179a32df7..834ee080a1fa757bf49b506c2781971c89d8611c 100644 (file)
--- a/meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch
@@ -1,15 +1,19 @@
-# Add by RP to address "unable to infer tagged configuration" error:
-#    commit 35de05e61b88c0808a5e885bb0efdf420555d5ad
-#    Author: Richard Purdie <rpurdie@rpsys.net>
-#    Date:   Sun Jun 1 16:13:38 2008 +0000
-#
-#    apmd: Use libtool --tag options to avoid problems with libtool 2.2.4 (from poky)
-#
-# However I didn't see same issue with current libtool-2.2.10. Also per my understanding,
-# the default tag, if not specified, falls back to CC. So disable it from patching, but
-# keep it here. If we encounter similar issue in the future, we could then push upstream
-#
-# Comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-16
+Add by RP to address "unable to infer tagged configuration" error:
+   commit 35de05e61b88c0808a5e885bb0efdf420555d5ad
+   Author: Richard Purdie <rpurdie@rpsys.net>
+   Date:   Sun Jun 1 16:13:38 2008 +0000
+
+   apmd: Use libtool --tag options to avoid problems with libtool 2.2.4 (from poky)
+
+However I didn't see same issue with current libtool-2.2.10. Also per my understanding,
+the default tag, if not specified, falls back to CC. So disable it from patching, but
+keep it here. If we encounter similar issue in the future, we could then push upstream
+
+Comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-16
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 
 Index: apmd-3.2.2.orig/Makefile
 ===================================================================

diff --git a/meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch b/meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch
index c64e7df524a834b3986d079ea506e75f8b8146a7..ec8206cf174cbb034bf12d331a1255d4ca5d3c58 100644 (file)
--- a/meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch
@@ -1,11 +1,15 @@
-# copy OE commit message here:
-#    commit 9456cdc1cf43e3ba9e6d88c63560c1b6fdee4359
-#    Author: Michael Krelin <hacker@klever.net>
-#    Date:   Tue May 29 12:27:45 2007 +0000
-#
-#    apmd: prevent build from interferring with host kernel headers. Closes #1257
-# 
-# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-13
+copy OE commit message here:
+   commit 9456cdc1cf43e3ba9e6d88c63560c1b6fdee4359
+   Author: Michael Krelin <hacker@klever.net>
+   Date:   Tue May 29 12:27:45 2007 +0000
+
+   apmd: prevent build from interferring with host kernel headers. Closes #1257
+
+comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-13
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 
 --- apmd-3.2.2.orig/Makefile
 +++ apmd-3.2.2/Makefile

diff --git a/meta/recipes-devtools/insserv/files/disable_runtests.patch b/meta/recipes-devtools/insserv/files/disable_runtests.patch
index 4e4084881a97e471caa39a3a51125c692b230baf..15a7dd80c08000f767e5b6e49d6e16eec4da1b72 100644 (file)
--- a/meta/recipes-devtools/insserv/files/disable_runtests.patch
+++ b/meta/recipes-devtools/insserv/files/disable_runtests.patch
@@ -1,7 +1,10 @@
-# Disable the make check runtime tests, which cannot be run when
-# cross-compiled.
-#
-# Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+Disable the make check runtime tests, which cannot be run when
+cross-compiled.
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
 diff -urN insserv-1.14.0.orig//Makefile insserv-1.14.0/Makefile
 --- insserv-1.14.0.orig//Makefile      2010-11-28 17:12:01.715597293 -0800
 +++ insserv-1.14.0/Makefile    2010-11-28 17:16:33.837780660 -0800

diff --git a/meta/recipes-devtools/insserv/files/makefile.patch b/meta/recipes-devtools/insserv/files/makefile.patch
index 19e99c63241e8ef258a3be1db430076ff3a6111c..5a248b680eb50265ef0f5d2322122199018697bd 100644 (file)
--- a/meta/recipes-devtools/insserv/files/makefile.patch
+++ b/meta/recipes-devtools/insserv/files/makefile.patch
@@ -1,7 +1,10 @@
-# Enable debug options and modify the use of CLFAGS (carried over
-# from the previous version's patch).
-#
-# Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+Enable debug options and modify the use of CLFAGS (carried over
+from the previous version's patch).
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
 diff -urN insserv-1.14.0.orig//Makefile insserv-1.14.0//Makefile
 --- insserv-1.14.0.orig//Makefile      2010-04-29 03:33:40.000000000 -0700
 +++ insserv-1.14.0//Makefile   2010-11-28 17:09:20.537996190 -0800

diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch
index 7ac1a1fa9392329e1f2e443aceab74016b4621f1..490b367990c4c19b1d3913dd518f15a3144eba8d 100644 (file)
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch
+++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch
@@ -2,7 +2,11 @@ Disable building documentation which requires the dvips utility.
 This patch should be dropped once we include a native version of
 dvips.
 
+Upstream-Status: Inappropriate [Other]
+Temporary workaround which disables documentation.
+
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
 diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh
 --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh  2011-02-25 15:26:41.142917782 -0800
 +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh       2011-02-25 15:27:25.141917472 -0800

diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
index 0fcacebf2b9b9b89ec15791cac507c163656edf0..424410d5249e2993722e240a25ff0d9ba4b8f4b7 100644 (file)
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
+++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
@@ -3,7 +3,11 @@ link to a shared library version of flex. Flex only ships with a
 static lib. Rather than diverging from upstream flex, simply skip
 building this un-needed utility.
 
+Upstream-Status: Inappropriate [Other]
+Workaround which disables a feature.
+
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
 diff -urN linuxdoc-tools-0.9.66.orig//Makefile.in linuxdoc-tools-0.9.66/Makefile.in
 --- linuxdoc-tools-0.9.66.orig//Makefile.in    2009-11-09 11:58:25.000000000 -0800
 +++ linuxdoc-tools-0.9.66/Makefile.in  2011-02-24 15:37:46.556937051 -0800

diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch
index f47693be001bc89ff703c4a027047bb1ac4184df..b62895c67d09ec03f35495671e46e7819290a26e 100644 (file)
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch
+++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch
@@ -2,7 +2,11 @@ Disable building documentation which requires the latex utility.
 This patch should be dropped once we include a native version of
 latex.
 
+Upstream-Status: Inappropriate [Other]
+Temporary workaround which disables documentation.
+
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
 diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh
 --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh  2009-11-09 11:58:25.000000000 -0800
 +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh       2011-02-25 15:23:58.610016114 -0800

diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch
index 17c76701708d7398033e11d30b8258a71665eeaa..8d784110dbf991d2acbff450d90555f4727437c1 100644 (file)
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch
+++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch
@@ -9,7 +9,11 @@ during do_install:
 | troff: fatal error: can't find macro file s
 |  fmt_txt::postASP: Empty output file, error when calling groff. Aborting...
 
+Upstream-Status: Inappropriate [Other]
+Temporary workaround which disables documentation.
+
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
 diff -urN linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh
 --- linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800
 +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh       2011-03-04 17:37:24.788923998 -0800

diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
index 84e1d63151d18b5f1a6724a2f3e81f0c0467b37a..968b9b47cf631ac5be9a9c7f528d20e3dff70fcb 100644 (file)
--- a/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
+++ b/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
@@ -1,7 +1,11 @@
 This patch fixes libtool QA issues with WORKDIR creeping in to
 libospgrove.la and libostyle.la. Patch obtained from OpenEmbedded.
 
+Upstream-Status: Inappropriate [Other]
+Workaround is specific to our build system.
+
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
 Index: openjade-1.3.2/spgrove/Makefile.sub
 ===================================================================
 --- openjade-1.3.2.orig/spgrove/Makefile.sub

diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch
index 2f2adfe34043164445dc09166cfe0bc5578487c9..073af46fc577868df5d43fd5e260ee512b469298 100644 (file)
--- a/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch
+++ b/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch
@@ -12,6 +12,10 @@ https://bugs.gentoo.org/358021
 http://clang.llvm.org/compatibility.html#default_init_const
 http://gcc.gnu.org/PR44499"
 
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
 --- a/jade/TeXFOTBuilder.cxx
 +++ b/jade/TeXFOTBuilder.cxx
 @@ -88,6 +88,8 @@ public:

diff --git a/meta/recipes-devtools/sgmlspl/files/combined.patch b/meta/recipes-devtools/sgmlspl/files/combined.patch
index 31536f53e6bffdfc18ce7447da3b0dfafdd86597..bea3dabd2151cd7ce7833b149c568539de5a0937 100644 (file)
--- a/meta/recipes-devtools/sgmlspl/files/combined.patch
+++ b/meta/recipes-devtools/sgmlspl/files/combined.patch
@@ -1,6 +1,9 @@
 Patch obtained from OpenEmbedded.
 
+Upstream-Status: Pending
+
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
 --- libsgmls-perl-1.03ii.orig/Makefile
 +++ libsgmls-perl-1.03ii/Makefile
 @@ -94,5 +94,5 @@

diff --git a/meta/recipes-extended/sudo/files/libtool.patch b/meta/recipes-extended/sudo/files/libtool.patch
index 22fda535d6de184d5690dd7f72046573fc40c367..b0cd67551854e79a0c29728fa24a50a66a56aacb 100644 (file)
--- a/meta/recipes-extended/sudo/files/libtool.patch
+++ b/meta/recipes-extended/sudo/files/libtool.patch
@@ -1,7 +1,7 @@
 Fix path to libtool scripts so autoreconf can succeed.
 
 Upstream-Status: Inappropriate [Other]
-Workaround specific to our build system.
+Workaround is specific to our build system.
 
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>