9 files changed, 41 insertions, 8 deletions

diff --git a/meta/recipes-devtools/insserv/files/disable_runtests.patch b/meta/recipes-devtools/insserv/files/disable_runtests.patch
index 4e4084881a..15a7dd80c0 100644
--- 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 19e99c6324..5a248b680e 100644
--- 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 7ac1a1fa93..490b367990 100644
--- 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 0fcacebf2b..424410d524 100644
--- 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 f47693be00..b62895c67d 100644
--- 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 17c7670170..8d784110db 100644
--- 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 84e1d63151..968b9b47cf 100644
--- 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 2f2adfe340..073af46fc5 100644
--- 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 31536f53e6..bea3dabd21 100644
--- 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 @@