From ceeb54d926301d71d34ee3429c001f0eec23afa8 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Tue, 17 May 2011 21:26:36 +0800 Subject: [PATCH] Upstream-Status: Update patch upstream-status for GPLv2 recipes Including gzip and mtoools (From OE-Core rev: b60b9ae2422d50c65aa604b726eb36b3db6508ff) Signed-off-by: Zhai Edwin Signed-off-by: Richard Purdie --- meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch | 2 ++ meta/recipes-devtools/mtools/mtools/mtools.patch | 2 ++ meta/recipes-devtools/mtools/mtools/no-x11.patch | 2 ++ meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch | 3 +++ meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch | 3 +++ 5 files changed, 12 insertions(+) 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 @@ +Upstream-Status: Inappropriate [licensing] + --- mtools-3.9.9/configure.in.orig 2006-04-14 16:05:54.337655192 -0600 +++ mtools-3.9.9/configure.in 2006-04-14 16:12:29.736545424 -0600 @@ -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 $ Makefile.in | 74 ++++++++++++++++++++++++++---------------------------------- 1 file changed, 33 insertions(+), 41 deletions(-) +Upstream-Status: Inappropriate [licensing] + Index: mtools-3.9.9/Makefile.in =================================================================== --- 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 @@ Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +Upstream-Status: Inappropriate [licensing] + --- mtools-3.9.9.orig/Makefile.in +++ mtools-3.9.9/Makefile.in @@ -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 @@ gzip uses gnulib, whose header conflict with glibc. This patch rename some function to avoid conflict. Signed-off-by: Zhai Edwin + +Upstream-Status: Inappropriate [licensing] + Index: gzip-1.3.12/gzip.c =================================================================== --- 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 dependency of AC_GNU_SOURCE" Signed-off-by: Zhai Edwin + +Upstream-Status: Inappropriate [licensing] + Index: gzip-1.3.12/m4/extensions.m4 =================================================================== --- gzip-1.3.12.orig/m4/extensions.m4 2010-08-16 14:18:16.000000000 +0800