summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-05-17 21:26:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 15:14:46 +0100
commitceeb54d926301d71d34ee3429c001f0eec23afa8 (patch)
treeac442f2621dee58eb801d39508700c2c2f695862 /meta
parent97868aff11440c8445d1e870b07b3e39ee3af050 (diff)
downloadpoky-ceeb54d926301d71d34ee3429c001f0eec23afa8.tar.gz
Upstream-Status: Update patch upstream-status for GPLv2 recipes
Including gzip and mtoools (From OE-Core rev: b60b9ae2422d50c65aa604b726eb36b3db6508ff) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch2
-rw-r--r--meta/recipes-devtools/mtools/mtools/mtools.patch2
-rw-r--r--meta/recipes-devtools/mtools/mtools/no-x11.patch2
-rw-r--r--meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch3
-rw-r--r--meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch3
5 files changed, 12 insertions, 0 deletions
diff --git a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
index 35fae44aba..2e2873a4fa 100644
--- a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
+++ b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [licensing]
2
1--- mtools-3.9.9/configure.in.orig 2006-04-14 16:05:54.337655192 -0600 3--- mtools-3.9.9/configure.in.orig 2006-04-14 16:05:54.337655192 -0600
2+++ mtools-3.9.9/configure.in 2006-04-14 16:12:29.736545424 -0600 4+++ mtools-3.9.9/configure.in 2006-04-14 16:12:29.736545424 -0600
3@@ -21,6 +21,33 @@ 5@@ -21,6 +21,33 @@
diff --git a/meta/recipes-devtools/mtools/mtools/mtools.patch b/meta/recipes-devtools/mtools/mtools/mtools.patch
index 2abf534731..15a32088d1 100644
--- a/meta/recipes-devtools/mtools/mtools/mtools.patch
+++ b/meta/recipes-devtools/mtools/mtools/mtools.patch
@@ -4,6 +4,8 @@ $NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
4 Makefile.in | 74 ++++++++++++++++++++++++++---------------------------------- 4 Makefile.in | 74 ++++++++++++++++++++++++++----------------------------------
5 1 file changed, 33 insertions(+), 41 deletions(-) 5 1 file changed, 33 insertions(+), 41 deletions(-)
6 6
7Upstream-Status: Inappropriate [licensing]
8
7Index: mtools-3.9.9/Makefile.in 9Index: mtools-3.9.9/Makefile.in
8=================================================================== 10===================================================================
9--- mtools-3.9.9.orig/Makefile.in 2007-10-12 11:18:46.000000000 +0100 11--- mtools-3.9.9.orig/Makefile.in 2007-10-12 11:18:46.000000000 +0100
diff --git a/meta/recipes-devtools/mtools/mtools/no-x11.patch b/meta/recipes-devtools/mtools/mtools/no-x11.patch
index 300f43f000..705b62944d 100644
--- a/meta/recipes-devtools/mtools/mtools/no-x11.patch
+++ b/meta/recipes-devtools/mtools/mtools/no-x11.patch
@@ -2,6 +2,8 @@
2 Makefile.in | 2 +- 2 Makefile.in | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-) 3 1 file changed, 1 insertion(+), 1 deletion(-)
4 4
5Upstream-Status: Inappropriate [licensing]
6
5--- mtools-3.9.9.orig/Makefile.in 7--- mtools-3.9.9.orig/Makefile.in
6+++ mtools-3.9.9/Makefile.in 8+++ mtools-3.9.9/Makefile.in
7@@ -128,11 +128,11 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ 9@@ -128,11 +128,11 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
diff --git a/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch b/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
index 8308865a25..d9e8d212bf 100644
--- a/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
+++ b/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
@@ -1,6 +1,9 @@
1gzip uses gnulib, whose header conflict with glibc. This patch rename some function to avoid conflict. 1gzip uses gnulib, whose header conflict with glibc. This patch rename some function to avoid conflict.
2 2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4
5Upstream-Status: Inappropriate [licensing]
6
4Index: gzip-1.3.12/gzip.c 7Index: gzip-1.3.12/gzip.c
5=================================================================== 8===================================================================
6--- gzip-1.3.12.orig/gzip.c 2010-08-13 10:29:38.000000000 +0800 9--- gzip-1.3.12.orig/gzip.c 2010-08-13 10:29:38.000000000 +0800
diff --git a/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch b/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
index 927377286f..6b2f69870e 100644
--- a/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
+++ b/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
@@ -2,6 +2,9 @@ remove AC_USE_SYSTEM_EXTENSIONS to fix the autoconf error "AC_REQUIRE: circular
2dependency of AC_GNU_SOURCE" 2dependency of AC_GNU_SOURCE"
3 3
4Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 4Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
5
6Upstream-Status: Inappropriate [licensing]
7
5Index: gzip-1.3.12/m4/extensions.m4 8Index: gzip-1.3.12/m4/extensions.m4
6=================================================================== 9===================================================================
7--- gzip-1.3.12.orig/m4/extensions.m4 2010-08-16 14:18:16.000000000 +0800 10--- gzip-1.3.12.orig/m4/extensions.m4 2010-08-16 14:18:16.000000000 +0800