summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJon Grimm <jon.grimm@canonical.com>2016-11-22 17:09:53 -0600
committerScott Moser <smoser@brickies.net>2016-12-22 17:04:28 -0500
commitb2a9f33616c806ae6e052520a8589113308f567c (patch)
treee24d64e56104dfa1b608a9f255c9b8f618e45cc0 /packages
parent0b0f254a6935a1b1fff128fa177152dd519e1a3d (diff)
downloadvyos-cloud-init-b2a9f33616c806ae6e052520a8589113308f567c.tar.gz
vyos-cloud-init-b2a9f33616c806ae6e052520a8589113308f567c.zip
LICENSE: Allow dual licensing GPL-3 or Apache 2.0
This has been a recurring ask and we had initially just made the change to the cloud-init 2.0 codebase. As the current thinking is we'll just continue to enhance the current codebase, its desirable to relicense to match what we'd intended as part of the 2.0 plan here. - put a brief description of license in LICENSE file - put full license versions in LICENSE-GPLv3 and LICENSE-Apache2.0 - simplify the per-file header to reference LICENSE - tox: ignore H102 (Apache License Header check) Add license header to files that ship. Reformat headers, make sure everything has vi: at end of file. Non-shipping files do not need the copyright header, but at the moment tests/ have it.
Diffstat (limited to 'packages')
-rw-r--r--packages/debian/copyright16
-rw-r--r--packages/redhat/cloud-init.spec.in2
-rw-r--r--packages/suse/cloud-init.spec.in2
3 files changed, 18 insertions, 2 deletions
diff --git a/packages/debian/copyright b/packages/debian/copyright
index c694f30d..c9c7d231 100644
--- a/packages/debian/copyright
+++ b/packages/debian/copyright
@@ -12,6 +12,7 @@ Upstream Author: Scott Moser <smoser@canonical.com>
Chuck Short <chuck.short@canonical.com>
Copyright: 2010, Canonical Ltd.
+License: GPL-3 or Apache-2.0
License: GPL-3
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 3, as
@@ -27,3 +28,18 @@ License: GPL-3
The complete text of the GPL version 3 can be seen in
/usr/share/common-licenses/GPL-3.
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index 79f45947..fd3cf938 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -11,7 +11,7 @@ Release: 1${subrelease}%{?dist}
Summary: Cloud instance init scripts
Group: System Environment/Base
-License: GPLv3
+License: Dual-licesed GPLv3 or Apache 2.0
URL: http://launchpad.net/cloud-init
Source0: ${archive_name}
diff --git a/packages/suse/cloud-init.spec.in b/packages/suse/cloud-init.spec.in
index f994a0cf..6ce0be8c 100644
--- a/packages/suse/cloud-init.spec.in
+++ b/packages/suse/cloud-init.spec.in
@@ -10,7 +10,7 @@ Release: 1${subrelease}%{?dist}
Summary: Cloud instance init scripts
Group: System/Management
-License: GPLv3
+License: Dual licensed GPLv3 or Apache 2.0
URL: http://launchpad.net/cloud-init
Source0: ${archive_name}