From patchwork Tue Sep 20 00:19:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9340811 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E9318607D0 for ; Tue, 20 Sep 2016 00:28:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCEA228744 for ; Tue, 20 Sep 2016 00:28:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D021B28D7B; Tue, 20 Sep 2016 00:28:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6C5E6285B6 for ; Tue, 20 Sep 2016 00:28:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bm8sK-0007my-S0; Tue, 20 Sep 2016 00:25:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bm8sJ-0007lu-LS for xen-devel@lists.xen.org; Tue, 20 Sep 2016 00:25:27 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 4F/08-01343-6F180E75; Tue, 20 Sep 2016 00:25:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpjkeJIrShJLcpLzFFi42KZM10+UPdb44N wgzeLGS2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oz1bxYyFvQXVLSdvMXYwPgqtouRi0NIoI1J 4ui6PmYI5wujxKHp/5ggnI2MElNefmeEcHoYJfa9mgjkcHKwCRhJnD06HcwWEZCWuPb5MpjNL HCQRWLfPP4uRg4OYYEQiWfLE0BMFgFViX99uiAVvAJeElseTwarlhBQkJjy8D0ziM0p4C0x8e oTVpByIaCa/c3eECWGEqcfbmOcwMi3gJFhFaNGcWpRWWqRrpGRXlJRZnpGSW5iZo6uoYGpXm5 qcXFiempOYlKxXnJ+7iZGYJjUMzAw7mDc0+53iFGSg0lJlFeO70G4EF9SfkplRmJxRnxRaU5q 8SFGGQ4OJQle9wagnGBRanpqRVpmDjBgYdISHDxKIrxGIGne4oLE3OLMdIjUKUZdjmNzb6xlE mLJy89LlRLn9QMpEgApyijNgxsBi55LjLJSwryMDAwMQjwFqUW5mSWo8q8YxTkYlYR5eUGm8G TmlcBtegV0BBPQEYw990GOKElESEk1MHpVLMv8LB67+SD3zA9LuwSNtVeKnelXfXeyfu2UBWL z3zQmaisWVN84e/X1jaU/HXJOHprtstHs4XN2VpvuSa4bNp2U3nZlzS/Z9OvKE9jvPIoOi7nP JnbNyXZl3L+VNytqq+YyvLh3TJQjRJh5w//nl64eZW/Un1ieyRSzakra4s4TXWUlWeuUWIozE g21mIuKEwFO2PsqmQIAAA== X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1474331123!60452513!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1110 invoked from network); 20 Sep 2016 00:25:25 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-4.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 20 Sep 2016 00:25:25 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8K0P6xk020275 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Sep 2016 00:25:06 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u8K0P5Jr027770 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Sep 2016 00:25:06 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u8K0P3gp014782; Tue, 20 Sep 2016 00:25:04 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 19 Sep 2016 17:25:03 -0700 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Mon, 19 Sep 2016 20:19:21 -0400 Message-Id: <1474330779-10645-4-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1474330779-10645-1-git-send-email-boris.ostrovsky@oracle.com> References: <1474330779-10645-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] Cc: Lars Kurth , Kevin Tian , wei.liu2@citrix.com, Kouya Shimura , andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, julien.grall@arm.com, Simon Horman , keke@lenovo.com, jbeulich@suse.com, zhaoshenglong@huawei.com, Stefan Berger , Boris Ostrovsky , Keir Fraser , Daniel Kiper , roger.pau@citrix.com Subject: [Xen-devel] [PATCH v4 03/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP ACPI builder is currently distributed under GPLv2 license. We plan to make the builder available to components other than the hvmloader (which is also GPLv2). Some of these components (such as libxl) may be distributed under LGPL-2.1 so that they can be used by non-GPLv2 callers. But this will not be possible if we incorporate the ACPI builder in those other components. To avoid this problem we are relicensing sources in ACPI bulder directory to the Lesser GNU Public License (LGPL) version 2.1 (dsdt.asl remains GPLv2 as we might need permission from Lenovo due to commit 801d469ad ("[HVM] ACPI support patch 3 of 4: ACPI _PRT table.")) Signed-off-by: Boris Ostrovsky Acked-by: Daniel Kiper Acked-by: Stefan Berger Acked-by: Kouya Shimura Acked-by: Jan Beulich Acked-by: Kevin Tian Acked-by: Keir Fraser Acked-by: Simon Horman Acked-by: Lars Kurth Acked-by: Konrad Rzeszutek Wilk [for Oracle, VirtualIron and Sun contributions] --- CC: Daniel Kiper CC: Stefan Berger CC: Kouya Shimura CC: Jan Beulich CC: Kevin Tian CC: Keir Fraser CC: Simon Horman CC: Lars Kurth CC: Konrad Rzeszutek Wilk CC: keke@lenovo.com --- Changes in v4: * Dropped dsdt.asl until Lenovo ACK is received (note that mk_dsdt.c *is* made LGPL) tools/firmware/hvmloader/acpi/Makefile | 18 ++++++++---------- tools/firmware/hvmloader/acpi/acpi2_0.h | 19 ++++++++----------- tools/firmware/hvmloader/acpi/build.c | 18 ++++++++---------- tools/firmware/hvmloader/acpi/mk_dsdt.c | 12 ++++++++++++ tools/firmware/hvmloader/acpi/ssdt_pm.asl | 11 ++++------- tools/firmware/hvmloader/acpi/ssdt_s3.asl | 11 ++++------- tools/firmware/hvmloader/acpi/ssdt_s4.asl | 11 ++++------- tools/firmware/hvmloader/acpi/ssdt_tpm.asl | 18 ++++++++---------- tools/firmware/hvmloader/acpi/static_tables.c | 18 ++++++++---------- 9 files changed, 64 insertions(+), 72 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile index 32d8c22..c6382bd 100644 --- a/tools/firmware/hvmloader/acpi/Makefile +++ b/tools/firmware/hvmloader/acpi/Makefile @@ -1,17 +1,15 @@ # # Copyright (c) 2004, Intel Corporation. # -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation; version 2.1 only. with the special +# exception on linking described in file LICENSE. # -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; If not, see . +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# NU Lesser General Public License for more details. # XEN_ROOT = $(CURDIR)/../../../.. diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h b/tools/firmware/hvmloader/acpi/acpi2_0.h index 87a558a..775eb7a 100644 --- a/tools/firmware/hvmloader/acpi/acpi2_0.h +++ b/tools/firmware/hvmloader/acpi/acpi2_0.h @@ -1,18 +1,15 @@ /* * Copyright (c) 2004, Intel Corporation. * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; If not, see . + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. */ #ifndef _ACPI_2_0_H_ #define _ACPI_2_0_H_ diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index dccddff..de56f1f 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -2,17 +2,15 @@ * Copyright (c) 2004, Intel Corporation. * Copyright (c) 2006, Keir Fraser, XenSource Inc. * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, version - * 2, as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. * - * This program is distributed in the hope it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * this program; If not, see . + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. */ #include "acpi2_0.h" diff --git a/tools/firmware/hvmloader/acpi/mk_dsdt.c b/tools/firmware/hvmloader/acpi/mk_dsdt.c index 7656b5d..e750820 100644 --- a/tools/firmware/hvmloader/acpi/mk_dsdt.c +++ b/tools/firmware/hvmloader/acpi/mk_dsdt.c @@ -1,3 +1,15 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + #include #include #include diff --git a/tools/firmware/hvmloader/acpi/ssdt_pm.asl b/tools/firmware/hvmloader/acpi/ssdt_pm.asl index 1a7d752..d81b1f2 100644 --- a/tools/firmware/hvmloader/acpi/ssdt_pm.asl +++ b/tools/firmware/hvmloader/acpi/ssdt_pm.asl @@ -5,17 +5,14 @@ * Copyright (c) 2008 Citrix Systems, Inc. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; If not, see . + * GNU Lesser General Public License for more details. */ /* diff --git a/tools/firmware/hvmloader/acpi/ssdt_s3.asl b/tools/firmware/hvmloader/acpi/ssdt_s3.asl index f89ac02..c83bbbf 100644 --- a/tools/firmware/hvmloader/acpi/ssdt_s3.asl +++ b/tools/firmware/hvmloader/acpi/ssdt_s3.asl @@ -4,17 +4,14 @@ * Copyright (c) 2011 Citrix Systems, Inc. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; If not, see . + * GNU Lesser General Public License for more details. */ DefinitionBlock ("SSDT_S3.aml", "SSDT", 2, "Xen", "HVM", 0) diff --git a/tools/firmware/hvmloader/acpi/ssdt_s4.asl b/tools/firmware/hvmloader/acpi/ssdt_s4.asl index d589e4b..325ac11 100644 --- a/tools/firmware/hvmloader/acpi/ssdt_s4.asl +++ b/tools/firmware/hvmloader/acpi/ssdt_s4.asl @@ -4,17 +4,14 @@ * Copyright (c) 2011 Citrix Systems, Inc. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; If not, see . + * GNU Lesser General Public License for more details. */ DefinitionBlock ("SSDT_S4.aml", "SSDT", 2, "Xen", "HVM", 0) diff --git a/tools/firmware/hvmloader/acpi/ssdt_tpm.asl b/tools/firmware/hvmloader/acpi/ssdt_tpm.asl index 2ae8ad4..a0fb1fd 100644 --- a/tools/firmware/hvmloader/acpi/ssdt_tpm.asl +++ b/tools/firmware/hvmloader/acpi/ssdt_tpm.asl @@ -3,17 +3,15 @@ * * Copyright (c) 2006, IBM Corporation. * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; If not, see . + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. */ /* SSDT for TPM TIS Interface for Xen with Qemu device model. */ diff --git a/tools/firmware/hvmloader/acpi/static_tables.c b/tools/firmware/hvmloader/acpi/static_tables.c index f4d627b..617bf68 100644 --- a/tools/firmware/hvmloader/acpi/static_tables.c +++ b/tools/firmware/hvmloader/acpi/static_tables.c @@ -2,17 +2,15 @@ * Copyright (c) 2004, Intel Corporation. * Copyright (c) 2006, Keir Fraser, XenSource Inc. * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; If not, see . + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. */ #include "acpi2_0.h"