]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/mini-os.git/commitdiff
minios: Update mini-os license to support GPL features
authorMatthew Fioravante <matthew.fioravante@jhuapl.edu>
Mon, 19 Nov 2012 12:59:48 +0000 (12:59 +0000)
committerMatthew Fioravante <matthew.fioravante@jhuapl.edu>
Mon, 19 Nov 2012 12:59:48 +0000 (12:59 +0000)
This patch updates extras/mini-os/COPYING to explain
which optional features are GPL and what the implications
of enabling them are.

Signed-off-by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
COPYING

diff --git a/COPYING b/COPYING
index c26ccfc43c2ec91f597a5c8b332211f475704167..1d9df6ce477a125f38b60d6f9e426a74acb2e256 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,16 @@
+Certain files in this directory are licensed by the GNU
+General Public License version 2 (GPLv2). By default these
+files are not built and linked into MiniOs. Enabling them
+will cause the whole work to become covered by the GPLv2.
+
+The current set of GPLv2 features are:
+CONFIG_TPMFRONT
+CONFIG_TPMBACK
+CONFIG_TPM_TIS
+
+Do not use these if you do not want your MiniOS build to become
+GPL licensed!
+
 Copyright (c) 2009 Citrix Systems, Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without