Dear guys,
2017-06-08 20:24 GMT+02:00 Jan Kiszka <[email protected]>:
>
> On 2017-06-08 19:27, Gustavo Lima Chaves wrote:
> > * Jan Kiszka <[email protected]> [2017-06-08 19:13:20 +0200]:
> >
> >> On 2017-06-08 18:48, Gustavo Lima Chaves wrote:
> >>>> We are currently evaluating Zephyr on Jailhouse, but that is still in a
> >>>> too early stage to contribute to this discussion or even a decision. How
> >>>> urgent is the topic for you?
> >>>
> >>> How far are you into Zephyr? I have patches doing a preliminar port, so
> >>> that
> >>> at least UART and LOAPIC timers are working from Zephyr just fine:
> >>>
> >>> """
> >>> Created cell "tiny-demo"
> >>> Page pool usage after cell creation: mem 275/1480, remap 65607/131072
> >>> Cell "tiny-demo" can be loaded
> >>> CPU 3 received SIPI, vector 100
> >>> Started cell "tiny-demo"
> >>> ***** BOOTING ZEPHYR OS v1.7.99 - BUILD: Jun 8 2017 00:36:18 *****
> >>> Hello World!
> >>> Hello World!
> >>> Hello World!
> >>> """
> >>>
> >>
> >> Hoho, good that I dropped this note - great to see this!
> >>
> >> I added Andreas to CC who is just starting off, maybe still a bit wet
> >> from the first bucket of cold Jailhouse water.
> >
> > :)
> >
> >>
> >>> This code lies on my hard disk only, for now, but sure I want to make
> >>> it upstream, if both parties agree on its usefulness (Zephyr and
> >>> Jailhouse). From a licensing POV, I just used a bare minimal excerpt
> >>> from header-32.S, and would indeed be great to have that code more
> >>> permissive, so that I would not have to bother re-writing it myself.
> >>
> >> Individual files would be easier to relicense, header-32.S is only owned
> >> by us e.g.
> >
> > Cool.
> >
> >>
> >>>
> >>> One thing I lost from not using the inmate lib was xAPIC access to the
> >>> LOAPIC, so my preliminar patch does rewrite those accesses to be
> >>> x2APIC (MSR-based).
> >>
> >> x2APIC is the better choice.
> >
> > Yeah, maybe, but the ifdefs on my patch are looking uglish (they might
> > want to keep the xAPIC access for the MCUs, I'm afraid).
>
> Sure, for bare-metal you likely need this (the Quark has no x2APIC, not
> even the big, I bet :).
>
> >
> >>
> >> But back to the topic, and actually there are two: writing applications
> >> on top of a permissive runtime - inmates lib or a permissively licensed
> >> RTOS - and providing reusable material to porting RTOSes over Jailhouse.
> >
> > Sure, the second approach is exactly what we'd have with my patches
> > (and possible right after header-32.S is good WRT licensing).
> >
> >> When doing a relicensing, the motivation and intended usage should be
> >> clearly defined before approaching all the copyright holders. And we
> >> should then also think about how to (re-)structure the code when we want
> >> to support the second case.
> >
> > Yeah. The 1st approach is very valid for me as well, and you got a
> > supporter here too for making its license different than of the rest
> > of the codebase.
> >
>
> OK, let's get serious: Claudio, you offered to go after the copyright
> holders. Could you prepare a reasoning email for the license change and
> a patch to perform it? That could be sent to those folks, collect their
> acks, and I could also use it for starting the process internally to add
> ours.
Pasted below. Let me get your feedback.
Many thanks and best regards,
Claudio
========================================
Subject: Request for relicensing your contribution to Jailhouse
Dear developer,
your name is listed among the authors of the source code within the
inmates/lib/ directory of Jailhouse, and therefore you are among the copyright
holders of a part of such library.
The library is currently licensed under GPL, meaning that it cannot be linked
to proprietary code unless by releasing such code under GPL. This prevents the
usage of the hypervisor in all industrial contexts where the inmate code cannot
be disclosed. For this reason, the jailhouse community is currently discussing
[1] the possibility/opportunity of changing the license of just the inmate
library to one allowing static linking of proprietary code (e.g., GPL+linking
exception [2]). The license of the hypervisor and of the Linux driver will
remain untouched.
A relicensing of the source code needs the unanimous consent of all the
copyright holders of the library. A proposal of change is therefore pasted
below. I kindly ask you to tell me if you officially consent to such change.
Don't hesitate to contact me in case you need any further clarification.
Many thanks for your time and your contribution. Best regards.
Claudio
[1] https://groups.google.com/forum/#!topic/jailhouse-dev/eskAY0BGhWc
[2] https://en.wikipedia.org/wiki/GPL_linking_exception
========================================
>From 93831ca738a0a412fe5a69e37c4d7101632ff907 Mon Sep 17 00:00:00 2001
From: Claudio Scordino <[email protected]>
Date: Mon, 12 Jun 2017 09:35:11 +0200
Subject: [PATCH] License change for the inmate library.
Signed-off-by: Claudio Scordino <[email protected]>
---
LICENSING.md | 4 ++++
inmates/lib/COPYING | 18 ++++++++++++++++++
inmates/lib/arm-common/Makefile.lib | 6 +++---
inmates/lib/arm-common/gic-v2.c | 5 +++--
inmates/lib/arm-common/gic.c | 5 +++--
inmates/lib/arm-common/include/gic.h | 5 +++--
inmates/lib/arm-common/include/inmate.h | 5 +++--
inmates/lib/arm-common/include/uart.h | 5 +++--
inmates/lib/arm-common/printk.c | 5 +++--
inmates/lib/arm-common/timer.c | 5 +++--
inmates/lib/arm-common/uart-8250.c | 5 +++--
inmates/lib/arm-common/uart-jailhouse.c | 5 +++--
inmates/lib/arm-common/uart-pl011.c | 5 +++--
inmates/lib/arm-common/uart-xuartps.c | 5 +++--
inmates/lib/arm/Makefile | 5 +++--
inmates/lib/arm/Makefile.lib | 5 +++--
inmates/lib/arm/gic-v3.c | 5 +++--
inmates/lib/arm/header.S | 5 +++--
inmates/lib/arm/include/arch/gic.h | 5 +++--
inmates/lib/arm/include/arch/inmate.h | 5 +++--
inmates/lib/arm/include/mach.h | 5 +++--
inmates/lib/arm/inmate.lds.S | 5 +++--
inmates/lib/arm64/Makefile | 5 +++--
inmates/lib/arm64/Makefile.lib | 5 +++--
inmates/lib/arm64/header.S | 5 +++--
inmates/lib/arm64/include/arch/gic.h | 5 +++--
inmates/lib/arm64/include/arch/inmate.h | 5 +++--
inmates/lib/arm64/include/mach.h | 5 +++--
inmates/lib/arm64/inmate.lds.S | 5 +++--
inmates/lib/cmdline.c | 5 +++--
inmates/lib/inmate_common.h | 5 +++--
inmates/lib/pci.c | 5 +++--
inmates/lib/string.c | 5 +++--
inmates/lib/x86/Makefile | 5 +++--
inmates/lib/x86/Makefile.lib | 5 +++--
inmates/lib/x86/header-32.S | 5 +++--
inmates/lib/x86/header.S | 5 +++--
inmates/lib/x86/hypercall.c | 5 +++--
inmates/lib/x86/inmate.h | 5 +++--
inmates/lib/x86/inmate.lds | 5 +++--
inmates/lib/x86/int.c | 5 +++--
inmates/lib/x86/ioapic.c | 5 +++--
inmates/lib/x86/mem.c | 5 +++--
inmates/lib/x86/pci.c | 5 +++--
inmates/lib/x86/printk.c | 5 +++--
inmates/lib/x86/smp.c | 5 +++--
inmates/lib/x86/timing.c | 5 +++--
47 files changed, 157 insertions(+), 91 deletions(-)
create mode 100644 inmates/lib/COPYING
diff --git a/LICENSING.md b/LICENSING.md
index 682635c..7ddc88b 100644
--- a/LICENSING.md
+++ b/LICENSING.md
@@ -14,6 +14,10 @@ that suits best your particular use case. You can
also continue to use the
file under the dual license. When choosing only one, remove the reference to
the other from the file header.
+The inmate library is distributed under the terms of the GPLv2 with a special
+exception that allows static or dynamic linking to independent modules. See the
+file [inmates/lib/COPYING](inmates/lib/COPYING) for further information.
+
License Usage
-------------
diff --git a/inmates/lib/COPYING b/inmates/lib/COPYING
new file mode 100644
index 0000000..e698e6a
--- /dev/null
+++ b/inmates/lib/COPYING
@@ -0,0 +1,18 @@
+The inmate library is distributed under the terms of the GNU General Public
+License contained in the COPYING file in the top-level directory with the
+following clarification and special exception.
+
+Linking this library statically or dynamically with other modules is making a
+combined work based on this library. Thus, the terms and conditions of the GNU
+General Public License cover the whole combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent modules, and
+to copy and distribute the resulting executable under terms of your choice,
+provided that you also meet, for each linked independent module, the terms and
+conditions of the license of that module. An independent module is a module
+which is not derived from or based on this library. If you modify this library,
+you may extend this exception to your version of the library, but you are not
+obliged to do so. If you do not wish to do so, delete this exception statement
+from your version.
diff --git a/inmates/lib/arm-common/Makefile.lib
b/inmates/lib/arm-common/Makefile.lib
index f66f452..ec0e98d 100644
--- a/inmates/lib/arm-common/Makefile.lib
+++ b/inmates/lib/arm-common/Makefile.lib
@@ -6,9 +6,9 @@
# Authors:
# Ralf Ramsauer <[email protected]>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
-#
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
GCOV_PROFILE := n
diff --git a/inmates/lib/arm-common/gic-v2.c b/inmates/lib/arm-common/gic-v2.c
index 23d5b5f..f5b60c2 100644
--- a/inmates/lib/arm-common/gic-v2.c
+++ b/inmates/lib/arm-common/gic-v2.c
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <mach.h>
diff --git a/inmates/lib/arm-common/gic.c b/inmates/lib/arm-common/gic.c
index 22014d3..8156b9f 100644
--- a/inmates/lib/arm-common/gic.c
+++ b/inmates/lib/arm-common/gic.c
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/arm-common/include/gic.h
b/inmates/lib/arm-common/include/gic.h
index fc7963e..0cc8db8 100644
--- a/inmates/lib/arm-common/include/gic.h
+++ b/inmates/lib/arm-common/include/gic.h
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#ifndef _JAILHOUSE_INMATES_GIC_H
diff --git a/inmates/lib/arm-common/include/inmate.h
b/inmates/lib/arm-common/include/inmate.h
index 99ab37f..40b86fa 100644
--- a/inmates/lib/arm-common/include/inmate.h
+++ b/inmates/lib/arm-common/include/inmate.h
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#ifndef _JAILHOUSE_INMATE_H
diff --git a/inmates/lib/arm-common/include/uart.h
b/inmates/lib/arm-common/include/uart.h
index 0ef455b..16bbce5 100644
--- a/inmates/lib/arm-common/include/uart.h
+++ b/inmates/lib/arm-common/include/uart.h
@@ -6,8 +6,9 @@
* Authors:
* Ralf Ramsauer <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
struct uart_chip {
diff --git a/inmates/lib/arm-common/printk.c b/inmates/lib/arm-common/printk.c
index b9e4ee7..da8c38a 100644
--- a/inmates/lib/arm-common/printk.c
+++ b/inmates/lib/arm-common/printk.c
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/arm-common/timer.c b/inmates/lib/arm-common/timer.c
index 4681a69..5932e24 100644
--- a/inmates/lib/arm-common/timer.c
+++ b/inmates/lib/arm-common/timer.c
@@ -8,8 +8,9 @@
* Jean-Philippe Brucker <[email protected]>
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <asm/sysregs.h>
diff --git a/inmates/lib/arm-common/uart-8250.c
b/inmates/lib/arm-common/uart-8250.c
index 4eafe77..9fadf95 100644
--- a/inmates/lib/arm-common/uart-8250.c
+++ b/inmates/lib/arm-common/uart-8250.c
@@ -8,8 +8,9 @@
* Jean-Philippe Brucker <[email protected]>
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/arm-common/uart-jailhouse.c
b/inmates/lib/arm-common/uart-jailhouse.c
index 6678884..69bea98 100644
--- a/inmates/lib/arm-common/uart-jailhouse.c
+++ b/inmates/lib/arm-common/uart-jailhouse.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/arm-common/uart-pl011.c
b/inmates/lib/arm-common/uart-pl011.c
index 9657684..8d7effa 100644
--- a/inmates/lib/arm-common/uart-pl011.c
+++ b/inmates/lib/arm-common/uart-pl011.c
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/arm-common/uart-xuartps.c
b/inmates/lib/arm-common/uart-xuartps.c
index e6518e1..313a008 100644
--- a/inmates/lib/arm-common/uart-xuartps.c
+++ b/inmates/lib/arm-common/uart-xuartps.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/arm/Makefile b/inmates/lib/arm/Makefile
index 7326c32..da7597e 100644
--- a/inmates/lib/arm/Makefile
+++ b/inmates/lib/arm/Makefile
@@ -6,8 +6,9 @@
# Authors:
# Jan Kiszka <[email protected]>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#
include $(INMATES_LIB)/Makefile.lib
diff --git a/inmates/lib/arm/Makefile.lib b/inmates/lib/arm/Makefile.lib
index f84b84e..722b045 100644
--- a/inmates/lib/arm/Makefile.lib
+++ b/inmates/lib/arm/Makefile.lib
@@ -8,8 +8,9 @@
# Jean-Philippe Brucker <[email protected]>
# Jan Kiszka <[email protected]>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#
KBUILD_AFLAGS := $(filter-out -include asm/unified.h,$(KBUILD_AFLAGS))
diff --git a/inmates/lib/arm/gic-v3.c b/inmates/lib/arm/gic-v3.c
index 6831597..189f21d 100644
--- a/inmates/lib/arm/gic-v3.c
+++ b/inmates/lib/arm/gic-v3.c
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <asm/sysregs.h>
diff --git a/inmates/lib/arm/header.S b/inmates/lib/arm/header.S
index 72fe3a0..4eb74c6 100644
--- a/inmates/lib/arm/header.S
+++ b/inmates/lib/arm/header.S
@@ -8,8 +8,9 @@
* Jean-Philippe Brucker <[email protected]>
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <asm/sysregs.h>
diff --git a/inmates/lib/arm/include/arch/gic.h
b/inmates/lib/arm/include/arch/gic.h
index 9e1e988..ab504f6 100644
--- a/inmates/lib/arm/include/arch/gic.h
+++ b/inmates/lib/arm/include/arch/gic.h
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#ifndef __ASSEMBLY__
diff --git a/inmates/lib/arm/include/arch/inmate.h
b/inmates/lib/arm/include/arch/inmate.h
index f113c9a..0855550 100644
--- a/inmates/lib/arm/include/arch/inmate.h
+++ b/inmates/lib/arm/include/arch/inmate.h
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
/*
diff --git a/inmates/lib/arm/include/mach.h b/inmates/lib/arm/include/mach.h
index a255947..87d4b8e 100644
--- a/inmates/lib/arm/include/mach.h
+++ b/inmates/lib/arm/include/mach.h
@@ -8,8 +8,9 @@
* Jan Kiszka <[email protected]>
* Jean-Philippe Brucker <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#ifdef CONFIG_MACH_JETSON_TK1
diff --git a/inmates/lib/arm/inmate.lds.S b/inmates/lib/arm/inmate.lds.S
index 2164947..66782df 100644
--- a/inmates/lib/arm/inmate.lds.S
+++ b/inmates/lib/arm/inmate.lds.S
@@ -8,8 +8,9 @@
* Jean-Philippe Brucker <[email protected]>
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <jailhouse/config.h>
diff --git a/inmates/lib/arm64/Makefile b/inmates/lib/arm64/Makefile
index 554c0d1..d50a144 100644
--- a/inmates/lib/arm64/Makefile
+++ b/inmates/lib/arm64/Makefile
@@ -6,8 +6,9 @@
# Authors:
# Jan Kiszka <[email protected]>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#
include $(INMATES_LIB)/Makefile.lib
diff --git a/inmates/lib/arm64/Makefile.lib b/inmates/lib/arm64/Makefile.lib
index 7481f8d..c9f19a7 100644
--- a/inmates/lib/arm64/Makefile.lib
+++ b/inmates/lib/arm64/Makefile.lib
@@ -8,8 +8,9 @@
# Jean-Philippe Brucker <[email protected]>
# Jan Kiszka <[email protected]>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#
LINUXINCLUDE += -I$(INMATES_LIB)/include
diff --git a/inmates/lib/arm64/header.S b/inmates/lib/arm64/header.S
index fe7bae7..fdac438 100644
--- a/inmates/lib/arm64/header.S
+++ b/inmates/lib/arm64/header.S
@@ -6,8 +6,9 @@
* Authors:
* Antonios Motakis <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
.macro ventry label
diff --git a/inmates/lib/arm64/include/arch/gic.h
b/inmates/lib/arm64/include/arch/gic.h
index 7cfe99e..00d1fec 100644
--- a/inmates/lib/arm64/include/arch/gic.h
+++ b/inmates/lib/arm64/include/arch/gic.h
@@ -6,8 +6,9 @@
* Authors:
* Ralf Ramsauer <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#define gic_setup_irq_stack()
diff --git a/inmates/lib/arm64/include/arch/inmate.h
b/inmates/lib/arm64/include/arch/inmate.h
index 2b473d1..095ba23 100644
--- a/inmates/lib/arm64/include/arch/inmate.h
+++ b/inmates/lib/arm64/include/arch/inmate.h
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
/*
diff --git a/inmates/lib/arm64/include/mach.h b/inmates/lib/arm64/include/mach.h
index af4f012..ac79d87 100644
--- a/inmates/lib/arm64/include/mach.h
+++ b/inmates/lib/arm64/include/mach.h
@@ -8,8 +8,9 @@
* Antonios Motakis <[email protected]>
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#ifdef CONFIG_MACH_AMD_SEATTLE
diff --git a/inmates/lib/arm64/inmate.lds.S b/inmates/lib/arm64/inmate.lds.S
index d6fb328..3c8b69c 100644
--- a/inmates/lib/arm64/inmate.lds.S
+++ b/inmates/lib/arm64/inmate.lds.S
@@ -6,8 +6,9 @@
* Authors:
* Antonios Motakis <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <jailhouse/config.h>
diff --git a/inmates/lib/cmdline.c b/inmates/lib/cmdline.c
index f6dc79c..bb0cf5d 100644
--- a/inmates/lib/cmdline.c
+++ b/inmates/lib/cmdline.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/inmate_common.h b/inmates/lib/inmate_common.h
index c4c6b17..0aa1693 100644
--- a/inmates/lib/inmate_common.h
+++ b/inmates/lib/inmate_common.h
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#define NULL ((void *)0)
diff --git a/inmates/lib/pci.c b/inmates/lib/pci.c
index 99b57e1..f80bb75 100644
--- a/inmates/lib/pci.c
+++ b/inmates/lib/pci.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/string.c b/inmates/lib/string.c
index e013e5a..db5a0e8 100644
--- a/inmates/lib/string.c
+++ b/inmates/lib/string.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/x86/Makefile b/inmates/lib/x86/Makefile
index dc5890d..dfcf16e 100644
--- a/inmates/lib/x86/Makefile
+++ b/inmates/lib/x86/Makefile
@@ -6,8 +6,9 @@
# Authors:
# Jan Kiszka <[email protected]>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#
include $(INMATES_LIB)/Makefile.lib
diff --git a/inmates/lib/x86/Makefile.lib b/inmates/lib/x86/Makefile.lib
index 54bddae..e2ff845 100644
--- a/inmates/lib/x86/Makefile.lib
+++ b/inmates/lib/x86/Makefile.lib
@@ -6,8 +6,9 @@
# Authors:
# Jan Kiszka <[email protected]>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#
KBUILD_CFLAGS += -m64 -mno-red-zone
diff --git a/inmates/lib/x86/header-32.S b/inmates/lib/x86/header-32.S
index 31a39fb..6310e18 100644
--- a/inmates/lib/x86/header-32.S
+++ b/inmates/lib/x86/header-32.S
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/x86/header.S b/inmates/lib/x86/header.S
index f3037dc..a083f99 100644
--- a/inmates/lib/x86/header.S
+++ b/inmates/lib/x86/header.S
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/x86/hypercall.c b/inmates/lib/x86/hypercall.c
index f710376..4f8b7fd 100644
--- a/inmates/lib/x86/hypercall.c
+++ b/inmates/lib/x86/hypercall.c
@@ -6,8 +6,9 @@
* Authors:
* Valentine Sinitsyn <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/x86/inmate.h b/inmates/lib/x86/inmate.h
index e255538..41724e0 100644
--- a/inmates/lib/x86/inmate.h
+++ b/inmates/lib/x86/inmate.h
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#ifndef _JAILHOUSE_INMATE_H
diff --git a/inmates/lib/x86/inmate.lds b/inmates/lib/x86/inmate.lds
index de6e592..6d4b634 100644
--- a/inmates/lib/x86/inmate.lds
+++ b/inmates/lib/x86/inmate.lds
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
/*
diff --git a/inmates/lib/x86/int.c b/inmates/lib/x86/int.c
index 6c4335d..2f5c171 100644
--- a/inmates/lib/x86/int.c
+++ b/inmates/lib/x86/int.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/x86/ioapic.c b/inmates/lib/x86/ioapic.c
index de96e21..836a405 100644
--- a/inmates/lib/x86/ioapic.c
+++ b/inmates/lib/x86/ioapic.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/x86/mem.c b/inmates/lib/x86/mem.c
index 3ae7aae..6b7befd 100644
--- a/inmates/lib/x86/mem.c
+++ b/inmates/lib/x86/mem.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/x86/pci.c b/inmates/lib/x86/pci.c
index 688018b..dffe38c 100644
--- a/inmates/lib/x86/pci.c
+++ b/inmates/lib/x86/pci.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/x86/printk.c b/inmates/lib/x86/printk.c
index 17a2cc3..550c7fe 100644
--- a/inmates/lib/x86/printk.c
+++ b/inmates/lib/x86/printk.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <stdarg.h>
diff --git a/inmates/lib/x86/smp.c b/inmates/lib/x86/smp.c
index accbb20..6e0855d 100644
--- a/inmates/lib/x86/smp.c
+++ b/inmates/lib/x86/smp.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
diff --git a/inmates/lib/x86/timing.c b/inmates/lib/x86/timing.c
index 2a0e231..fd46cf7 100644
--- a/inmates/lib/x86/timing.c
+++ b/inmates/lib/x86/timing.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <[email protected]>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/
#include <inmate.h>
--
2.7.4
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
