1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00

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

(From OE-Core rev: 89ff546de3ce6b1c441f04d7a153c4f8d514a749)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Garman
2011-05-16 17:34:13 -07:00
committed by Richard Purdie
parent ffef4dad89
commit a0da8e7e8f
12 changed files with 70 additions and 29 deletions
@@ -1,15 +1,19 @@
# Add by RP to address "unable to infer tagged configuration" error: Add by RP to address "unable to infer tagged configuration" error:
# commit 35de05e61b88c0808a5e885bb0efdf420555d5ad commit 35de05e61b88c0808a5e885bb0efdf420555d5ad
# Author: Richard Purdie <rpurdie@rpsys.net> Author: Richard Purdie <rpurdie@rpsys.net>
# Date: Sun Jun 1 16:13:38 2008 +0000 Date: Sun Jun 1 16:13:38 2008 +0000
#
# apmd: Use libtool --tag options to avoid problems with libtool 2.2.4 (from poky) 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, 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 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 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 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 Index: apmd-3.2.2.orig/Makefile
=================================================================== ===================================================================
@@ -1,11 +1,15 @@
# copy OE commit message here: copy OE commit message here:
# commit 9456cdc1cf43e3ba9e6d88c63560c1b6fdee4359 commit 9456cdc1cf43e3ba9e6d88c63560c1b6fdee4359
# Author: Michael Krelin <hacker@klever.net> Author: Michael Krelin <hacker@klever.net>
# Date: Tue May 29 12:27:45 2007 +0000 Date: Tue May 29 12:27:45 2007 +0000
#
# apmd: prevent build from interferring with host kernel headers. Closes #1257 apmd: prevent build from interferring with host kernel headers. Closes #1257
#
# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-13 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.orig/Makefile
+++ apmd-3.2.2/Makefile +++ apmd-3.2.2/Makefile
@@ -1,7 +1,10 @@
# Disable the make check runtime tests, which cannot be run when Disable the make check runtime tests, which cannot be run when
# cross-compiled. cross-compiled.
#
# Signed-off-by: Scott Garman <scott.a.garman@intel.com> 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 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.orig//Makefile 2010-11-28 17:12:01.715597293 -0800
+++ insserv-1.14.0/Makefile 2010-11-28 17:16:33.837780660 -0800 +++ insserv-1.14.0/Makefile 2010-11-28 17:16:33.837780660 -0800
@@ -1,7 +1,10 @@
# Enable debug options and modify the use of CLFAGS (carried over Enable debug options and modify the use of CLFAGS (carried over
# from the previous version's patch). from the previous version's patch).
#
# Signed-off-by: Scott Garman <scott.a.garman@intel.com> 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 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.orig//Makefile 2010-04-29 03:33:40.000000000 -0700
+++ insserv-1.14.0//Makefile 2010-11-28 17:09:20.537996190 -0800 +++ insserv-1.14.0//Makefile 2010-11-28 17:09:20.537996190 -0800
@@ -2,7 +2,11 @@ Disable building documentation which requires the dvips utility.
This patch should be dropped once we include a native version of This patch should be dropped once we include a native version of
dvips. dvips.
Upstream-Status: Inappropriate [Other]
Temporary workaround which disables documentation.
Signed-off-by: Scott Garman <scott.a.garman@intel.com> 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 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.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 +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:27:25.141917472 -0800
@@ -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 static lib. Rather than diverging from upstream flex, simply skip
building this un-needed utility. building this un-needed utility.
Upstream-Status: Inappropriate [Other]
Workaround which disables a feature.
Signed-off-by: Scott Garman <scott.a.garman@intel.com> 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 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.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 +++ linuxdoc-tools-0.9.66/Makefile.in 2011-02-24 15:37:46.556937051 -0800
@@ -2,7 +2,11 @@ Disable building documentation which requires the latex utility.
This patch should be dropped once we include a native version of This patch should be dropped once we include a native version of
latex. latex.
Upstream-Status: Inappropriate [Other]
Temporary workaround which disables documentation.
Signed-off-by: Scott Garman <scott.a.garman@intel.com> 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 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.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 +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:23:58.610016114 -0800
@@ -9,7 +9,11 @@ during do_install:
| troff: fatal error: can't find macro file s | troff: fatal error: can't find macro file s
| fmt_txt::postASP: Empty output file, error when calling groff. Aborting... | 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> 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 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.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 +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-03-04 17:37:24.788923998 -0800
@@ -1,7 +1,11 @@
This patch fixes libtool QA issues with WORKDIR creeping in to This patch fixes libtool QA issues with WORKDIR creeping in to
libospgrove.la and libostyle.la. Patch obtained from OpenEmbedded. 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> Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Index: openjade-1.3.2/spgrove/Makefile.sub Index: openjade-1.3.2/spgrove/Makefile.sub
=================================================================== ===================================================================
--- openjade-1.3.2.orig/spgrove/Makefile.sub --- openjade-1.3.2.orig/spgrove/Makefile.sub
@@ -12,6 +12,10 @@ https://bugs.gentoo.org/358021
http://clang.llvm.org/compatibility.html#default_init_const http://clang.llvm.org/compatibility.html#default_init_const
http://gcc.gnu.org/PR44499" http://gcc.gnu.org/PR44499"
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- a/jade/TeXFOTBuilder.cxx --- a/jade/TeXFOTBuilder.cxx
+++ b/jade/TeXFOTBuilder.cxx +++ b/jade/TeXFOTBuilder.cxx
@@ -88,6 +88,8 @@ public: @@ -88,6 +88,8 @@ public:
@@ -1,6 +1,9 @@
Patch obtained from OpenEmbedded. Patch obtained from OpenEmbedded.
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- libsgmls-perl-1.03ii.orig/Makefile --- libsgmls-perl-1.03ii.orig/Makefile
+++ libsgmls-perl-1.03ii/Makefile +++ libsgmls-perl-1.03ii/Makefile
@@ -94,5 +94,5 @@ @@ -94,5 +94,5 @@
@@ -1,7 +1,7 @@
Fix path to libtool scripts so autoreconf can succeed. Fix path to libtool scripts so autoreconf can succeed.
Upstream-Status: Inappropriate [Other] 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> Signed-off-by: Scott Garman <scott.a.garman@intel.com>