From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDIw2-0002k5-N9 for qemu-devel@nongnu.org; Thu, 29 Mar 2012 13:15:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDIvw-0000To-RH for qemu-devel@nongnu.org; Thu, 29 Mar 2012 13:14:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52014 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDIvw-0000TB-HJ for qemu-devel@nongnu.org; Thu, 29 Mar 2012 13:14:48 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 29 Mar 2012 19:14:39 +0200 Message-Id: <1333041282-3254-3-git-send-email-afaerber@suse.de> In-Reply-To: <1333041282-3254-1-git-send-email-afaerber@suse.de> References: <1333041282-3254-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 2/5] target-unicore32: Relicense to GPLv2+ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Stefan Weil , Guan Xuetao , Dor Laor , =?UTF-8?q?Andreas=20F=C3=A4rber?= Adopt the license text suggested by Guan Xue-tao (with a minor simplification) for all target-unicore/ files except helper.c. To helper.c Anthony Liguori contributed a qemu_malloc() -> g_malloc() conversion, still pending IBM relicensing approval, so that remains GPLv2 for now. By relicensing all possible parts now, we avoid having to formally relicense new, e.g., QOM code. Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Guan Xuetao Signed-off-by: Stefan Weil Signed-off-by: Blue Swirl Signed-off-by: Dor Laor --- target-unicore32/cpu.h | 3 ++- target-unicore32/helper.h | 3 ++- target-unicore32/op_helper.c | 3 ++- target-unicore32/translate.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h index a3f8589..8ec0d2f 100644 --- a/target-unicore32/cpu.h +++ b/target-unicore32/cpu.h @@ -5,7 +5,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * published by the Free Software Foundation, or (at your option) any + * later version. See the COPYING file in the top-level directory. */ #ifndef __CPU_UC32_H__ #define __CPU_UC32_H__ diff --git a/target-unicore32/helper.h b/target-unicore32/helper.h index 615de2a..5a3b8a4 100644 --- a/target-unicore32/helper.h +++ b/target-unicore32/helper.h @@ -3,7 +3,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * published by the Free Software Foundation, or (at your option) any + * later version. See the COPYING file in the top-level directory. */ #include "def-helper.h" =20 diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c index 638a020..b954c30 100644 --- a/target-unicore32/op_helper.c +++ b/target-unicore32/op_helper.c @@ -5,7 +5,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * published by the Free Software Foundation, or (at your option) any + * later version. See the COPYING file in the top-level directory. */ #include "cpu.h" #include "dyngen-exec.h" diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c index 3b3ba16..9793d14 100644 --- a/target-unicore32/translate.c +++ b/target-unicore32/translate.c @@ -5,7 +5,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * published by the Free Software Foundation, or (at your option) any + * later version. See the COPYING file in the top-level directory. */ #include #include --=20 1.7.7