diff mbox

[v4,03/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1

Message ID 1474330779-10645-4-git-send-email-boris.ostrovsky@oracle.com (mailing list archive)
State New, archived
Headers show

Commit Message

Boris Ostrovsky Sept. 20, 2016, 12:19 a.m. UTC 
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 <boris.ostrovsky@oracle.com>
Acked-by: Daniel Kiper <dkiper@net-space.pl>
Acked-by: Stefan Berger <stefanb@us.ibm.com>
Acked-by: Kouya Shimura <kouya@jp.fujitsu.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Kevin Tian <kevin.tian@intel.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Simon Horman <horms@verge.net.au>
Acked-by: Lars Kurth <lars.kurth@citrix.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> [for Oracle, VirtualIron and Sun contributions]
---
CC: Daniel Kiper <dkiper@net-space.pl>
CC: Stefan Berger <stefanb@us.ibm.com>
CC: Kouya Shimura <kouya@jp.fujitsu.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Kevin Tian <kevin.tian@intel.com>
CC: Keir Fraser <keir@xen.org>
CC: Simon Horman <horms@verge.net.au>
CC: Lars Kurth <lars.kurth@citrix.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
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(-)

Comments

Lars Kurth Sept. 20, 2016, 10:17 a.m. UTC | #1 
On 20/09/2016 01:19, "Boris Ostrovsky" <boris.ostrovsky@oracle.com> wrote:

>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 <boris.ostrovsky@oracle.com>

>Acked-by: Daniel Kiper <dkiper@net-space.pl>

>Acked-by: Stefan Berger <stefanb@us.ibm.com>

>Acked-by: Kouya Shimura <kouya@jp.fujitsu.com>

>Acked-by: Jan Beulich <jbeulich@suse.com>

>Acked-by: Kevin Tian <kevin.tian@intel.com>

>Acked-by: Keir Fraser <keir@xen.org>

>Acked-by: Simon Horman <horms@verge.net.au>

>Acked-by: Lars Kurth <lars.kurth@citrix.com>

>Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> [for Oracle,

>VirtualIron and Sun contributions]

>---

>CC: Daniel Kiper <dkiper@net-space.pl>

>CC: Stefan Berger <stefanb@us.ibm.com>

>CC: Kouya Shimura <kouya@jp.fujitsu.com>

>CC: Jan Beulich <jbeulich@suse.com>

>CC: Kevin Tian <kevin.tian@intel.com>

>CC: Keir Fraser <keir@xen.org>

>CC: Simon Horman <horms@verge.net.au>

>CC: Lars Kurth <lars.kurth@citrix.com>

>CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

>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 ++++++++----------


The directory tools/firmware/hvmloader/acpi/ should contain a COPYING file
containing the text following text

[1] http://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=tools/libxc/COPYING


I would replace the following block in [1] with a more verbose
description, 
which provides additional context and states our intention.

1 Note that the only valid version of the LGPL as far as the files in
   2 this directory (and its subdirectories) are concerned is _this_
   3 particular version of the license (i.e., *only* v2.1, not v2.2 or v3.x
   4 or whatever), unless explicitly otherwise stated.

This library is licensed under LGPL v2.1 to allow its usage in LGPL-2.1
libraries such as libxl. Note that the only valid version of the LGPL as
far as the files in this directory (and its subdirectories) are concerned
is _this_ particular version of the license (i.e., *only* v2.1, not v2.2
or v3.x, unless explicitly otherwise stated.

After this block


6 Where clause 3 is invoked in order to relicense under the GPL then
   7 this shall be considered to be GPL v2 only for files which have
   8 specified LGPL v2.1 only.

add



gpl sub-directory
=================
This directory contains a gpl sub-directory which contains code licensed
under the GPL v2, because we have not yet been able to get the permission
to relicense the relevant code to LGPL v2.1. See gpl/COPYING for more
information.

The makefile in this component allows to build a GPL and LGPL only
variant of this library, the latter omits all GPL source code.

Regards
Lars
diff mbox

Patch

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 <http://www.gnu.org/licenses/>.
+# 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 <http://www.gnu.org/licenses/>.
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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 <stdio.h>
 #include <stdarg.h>
 #include <stdint.h>
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 <http://www.gnu.org/licenses/>.
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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"