diff options
author | Scott Garman <scott.a.garman@intel.com> | 2011-05-16 17:34:13 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-18 14:32:46 +0100 |
commit | a0da8e7e8feccfc01646eb8f4fcfc5a1c6552b2c (patch) | |
tree | 998220b08f64b057f97d309e1078b9bdd27c7b17 | |
parent | ffef4dad894a6c8401ea0409936f52fe8e333fb2 (diff) | |
download | poky-a0da8e7e8feccfc01646eb8f4fcfc5a1c6552b2c.tar.gz |
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>
12 files changed, 70 insertions, 29 deletions
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 711e777084..834ee080a1 100644 --- 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 @@ | |||
1 | # Add by RP to address "unable to infer tagged configuration" error: | 1 | Add by RP to address "unable to infer tagged configuration" error: |
2 | # commit 35de05e61b88c0808a5e885bb0efdf420555d5ad | 2 | commit 35de05e61b88c0808a5e885bb0efdf420555d5ad |
3 | # Author: Richard Purdie <rpurdie@rpsys.net> | 3 | Author: Richard Purdie <rpurdie@rpsys.net> |
4 | # Date: Sun Jun 1 16:13:38 2008 +0000 | 4 | Date: Sun Jun 1 16:13:38 2008 +0000 |
5 | # | 5 | |
6 | # apmd: Use libtool --tag options to avoid problems with libtool 2.2.4 (from poky) | 6 | apmd: Use libtool --tag options to avoid problems with libtool 2.2.4 (from poky) |
7 | # | 7 | |
8 | # However I didn't see same issue with current libtool-2.2.10. Also per my understanding, | 8 | However I didn't see same issue with current libtool-2.2.10. Also per my understanding, |
9 | # the default tag, if not specified, falls back to CC. So disable it from patching, but | 9 | the default tag, if not specified, falls back to CC. So disable it from patching, but |
10 | # keep it here. If we encounter similar issue in the future, we could then push upstream | 10 | keep it here. If we encounter similar issue in the future, we could then push upstream |
11 | # | 11 | |
12 | # Comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-16 | 12 | Comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-16 |
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
13 | 17 | ||
14 | Index: apmd-3.2.2.orig/Makefile | 18 | Index: apmd-3.2.2.orig/Makefile |
15 | =================================================================== | 19 | =================================================================== |
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 c64e7df524..ec8206cf17 100644 --- 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 @@ | |||
1 | # copy OE commit message here: | 1 | copy OE commit message here: |
2 | # commit 9456cdc1cf43e3ba9e6d88c63560c1b6fdee4359 | 2 | commit 9456cdc1cf43e3ba9e6d88c63560c1b6fdee4359 |
3 | # Author: Michael Krelin <hacker@klever.net> | 3 | Author: Michael Krelin <hacker@klever.net> |
4 | # Date: Tue May 29 12:27:45 2007 +0000 | 4 | Date: Tue May 29 12:27:45 2007 +0000 |
5 | # | 5 | |
6 | # apmd: prevent build from interferring with host kernel headers. Closes #1257 | 6 | apmd: prevent build from interferring with host kernel headers. Closes #1257 |
7 | # | 7 | |
8 | # comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-13 | 8 | comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-13 |
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
9 | 13 | ||
10 | --- apmd-3.2.2.orig/Makefile | 14 | --- apmd-3.2.2.orig/Makefile |
11 | +++ apmd-3.2.2/Makefile | 15 | +++ 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 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 @@ | |||
1 | # Disable the make check runtime tests, which cannot be run when | 1 | Disable the make check runtime tests, which cannot be run when |
2 | # cross-compiled. | 2 | cross-compiled. |
3 | # | 3 | |
4 | # Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 4 | Upstream-Status: Pending |
5 | |||
6 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
7 | |||
5 | diff -urN insserv-1.14.0.orig//Makefile insserv-1.14.0/Makefile | 8 | diff -urN insserv-1.14.0.orig//Makefile insserv-1.14.0/Makefile |
6 | --- insserv-1.14.0.orig//Makefile 2010-11-28 17:12:01.715597293 -0800 | 9 | --- insserv-1.14.0.orig//Makefile 2010-11-28 17:12:01.715597293 -0800 |
7 | +++ insserv-1.14.0/Makefile 2010-11-28 17:16:33.837780660 -0800 | 10 | +++ 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 @@ | |||
1 | # Enable debug options and modify the use of CLFAGS (carried over | 1 | Enable debug options and modify the use of CLFAGS (carried over |
2 | # from the previous version's patch). | 2 | from the previous version's patch). |
3 | # | 3 | |
4 | # Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 4 | Upstream-Status: Pending |
5 | |||
6 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
7 | |||
5 | diff -urN insserv-1.14.0.orig//Makefile insserv-1.14.0//Makefile | 8 | diff -urN insserv-1.14.0.orig//Makefile insserv-1.14.0//Makefile |
6 | --- insserv-1.14.0.orig//Makefile 2010-04-29 03:33:40.000000000 -0700 | 9 | --- insserv-1.14.0.orig//Makefile 2010-04-29 03:33:40.000000000 -0700 |
7 | +++ insserv-1.14.0//Makefile 2010-11-28 17:09:20.537996190 -0800 | 10 | +++ 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. | |||
2 | This patch should be dropped once we include a native version of | 2 | This patch should be dropped once we include a native version of |
3 | dvips. | 3 | dvips. |
4 | 4 | ||
5 | Upstream-Status: Inappropriate [Other] | ||
6 | Temporary workaround which disables documentation. | ||
7 | |||
5 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 8 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
9 | |||
6 | diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | 10 | diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh |
7 | --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2011-02-25 15:26:41.142917782 -0800 | 11 | --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2011-02-25 15:26:41.142917782 -0800 |
8 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:27:25.141917472 -0800 | 12 | +++ 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 | |||
3 | static lib. Rather than diverging from upstream flex, simply skip | 3 | static lib. Rather than diverging from upstream flex, simply skip |
4 | building this un-needed utility. | 4 | building this un-needed utility. |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [Other] | ||
7 | Workaround which disables a feature. | ||
8 | |||
6 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 9 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
10 | |||
7 | diff -urN linuxdoc-tools-0.9.66.orig//Makefile.in linuxdoc-tools-0.9.66/Makefile.in | 11 | diff -urN linuxdoc-tools-0.9.66.orig//Makefile.in linuxdoc-tools-0.9.66/Makefile.in |
8 | --- linuxdoc-tools-0.9.66.orig//Makefile.in 2009-11-09 11:58:25.000000000 -0800 | 12 | --- linuxdoc-tools-0.9.66.orig//Makefile.in 2009-11-09 11:58:25.000000000 -0800 |
9 | +++ linuxdoc-tools-0.9.66/Makefile.in 2011-02-24 15:37:46.556937051 -0800 | 13 | +++ 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. | |||
2 | This patch should be dropped once we include a native version of | 2 | This patch should be dropped once we include a native version of |
3 | latex. | 3 | latex. |
4 | 4 | ||
5 | Upstream-Status: Inappropriate [Other] | ||
6 | Temporary workaround which disables documentation. | ||
7 | |||
5 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 8 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
9 | |||
6 | diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | 10 | diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh |
7 | --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800 | 11 | --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800 |
8 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:23:58.610016114 -0800 | 12 | +++ 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: | |||
9 | | troff: fatal error: can't find macro file s | 9 | | troff: fatal error: can't find macro file s |
10 | | fmt_txt::postASP: Empty output file, error when calling groff. Aborting... | 10 | | fmt_txt::postASP: Empty output file, error when calling groff. Aborting... |
11 | 11 | ||
12 | Upstream-Status: Inappropriate [Other] | ||
13 | Temporary workaround which disables documentation. | ||
14 | |||
12 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 15 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
16 | |||
13 | diff -urN linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | 17 | diff -urN linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh |
14 | --- linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800 | 18 | --- linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800 |
15 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-03-04 17:37:24.788923998 -0800 | 19 | +++ 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 @@ | |||
1 | This patch fixes libtool QA issues with WORKDIR creeping in to | 1 | This patch fixes libtool QA issues with WORKDIR creeping in to |
2 | libospgrove.la and libostyle.la. Patch obtained from OpenEmbedded. | 2 | libospgrove.la and libostyle.la. Patch obtained from OpenEmbedded. |
3 | 3 | ||
4 | Upstream-Status: Inappropriate [Other] | ||
5 | Workaround is specific to our build system. | ||
6 | |||
4 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 7 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
8 | |||
5 | Index: openjade-1.3.2/spgrove/Makefile.sub | 9 | Index: openjade-1.3.2/spgrove/Makefile.sub |
6 | =================================================================== | 10 | =================================================================== |
7 | --- openjade-1.3.2.orig/spgrove/Makefile.sub | 11 | --- 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 | |||
12 | http://clang.llvm.org/compatibility.html#default_init_const | 12 | http://clang.llvm.org/compatibility.html#default_init_const |
13 | http://gcc.gnu.org/PR44499" | 13 | http://gcc.gnu.org/PR44499" |
14 | 14 | ||
15 | Upstream-Status: Pending | ||
16 | |||
17 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
18 | |||
15 | --- a/jade/TeXFOTBuilder.cxx | 19 | --- a/jade/TeXFOTBuilder.cxx |
16 | +++ b/jade/TeXFOTBuilder.cxx | 20 | +++ b/jade/TeXFOTBuilder.cxx |
17 | @@ -88,6 +88,8 @@ public: | 21 | @@ -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 @@ | |||
1 | Patch obtained from OpenEmbedded. | 1 | Patch obtained from OpenEmbedded. |
2 | 2 | ||
3 | Upstream-Status: Pending | ||
4 | |||
3 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 5 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
6 | |||
4 | --- libsgmls-perl-1.03ii.orig/Makefile | 7 | --- libsgmls-perl-1.03ii.orig/Makefile |
5 | +++ libsgmls-perl-1.03ii/Makefile | 8 | +++ libsgmls-perl-1.03ii/Makefile |
6 | @@ -94,5 +94,5 @@ | 9 | @@ -94,5 +94,5 @@ |
diff --git a/meta/recipes-extended/sudo/files/libtool.patch b/meta/recipes-extended/sudo/files/libtool.patch index 22fda535d6..b0cd675518 100644 --- a/meta/recipes-extended/sudo/files/libtool.patch +++ b/meta/recipes-extended/sudo/files/libtool.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | Fix path to libtool scripts so autoreconf can succeed. | 1 | Fix path to libtool scripts so autoreconf can succeed. |
2 | 2 | ||
3 | Upstream-Status: Inappropriate [Other] | 3 | Upstream-Status: Inappropriate [Other] |
4 | Workaround specific to our build system. | 4 | Workaround is specific to our build system. |
5 | 5 | ||
6 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 6 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
7 | 7 | ||