Daniel P. Berrange wrote:
On Tue, May 11, 2010 at 08:59:45AM -0600, Eric Blake wrote:
> On 05/11/2010 08:44 AM, Jim Meyering wrote:
> > FYI, just pushed.
> >
> > I ran this command:
> >
> > cd tests && grep -l 'Copy.*Free.Sof' * |xargs perl -pi -e \
> > 's/Copyright \(C\) (.*) Free Software Foundation,/Copyright (C) $1 Red
Hat,/'
>
> While we're at it, should our tests be GPLv3 while the rest of libvirt
> is LGPLv2? One could argue that it is okay, since the tests are not
> installed, but it is still something we should be sure is intentional,
> and not another accident of copy-and-paste from other FSF files.
It is not a showstopper if a test is GPLv3, but I think its wise to keep
all the source code including tests LGPLv2+ licensed unless there's a
particular exception required. This means we don't have to worry about
mixed licensing when copying code between different areas of our tree.
Ok. Here you go:
Change induced by:
cd tests
perl -pi -e 's/(Foundation, either version) 3 (of the License,)/$1 2 $2/' \
$(git grep -l version.3.of.the.Lic)
From 685e0436120323a95f59c1c7cf7d3da105735710 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Tue, 11 May 2010 20:10:18 +0200
Subject: [PATCH] tests: use GPLv2+, not GPLv3
* tests/cpuset: Change from GPLv3 to GPLv2+
* tests/read-bufsiz: Likewise.
* tests/read-non-seekable: Likewise.
* tests/start: Likewise.
* tests/undefine: Likewise.
* tests/vcpupin: Likewise.
* tests/virsh-all: Likewise.
* tests/virsh-schedinfo: Likewise.
* tests/virsh-synopsis: Likewise.
---
tests/cpuset | 2 +-
tests/read-bufsiz | 2 +-
tests/read-non-seekable | 2 +-
tests/start | 2 +-
tests/undefine | 2 +-
tests/vcpupin | 2 +-
tests/virsh-all | 2 +-
tests/virsh-schedinfo | 2 +-
tests/virsh-synopsis | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/cpuset b/tests/cpuset
index 3c48f0a..800d3bc 100755
--- a/tests/cpuset
+++ b/tests/cpuset
@@ -5,7 +5,7 @@
# 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
diff --git a/tests/read-bufsiz b/tests/read-bufsiz
index 3ebc135..f0f03b9 100755
--- a/tests/read-bufsiz
+++ b/tests/read-bufsiz
@@ -5,7 +5,7 @@
# 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
diff --git a/tests/read-non-seekable b/tests/read-non-seekable
index 1aed286..d5ae027 100755
--- a/tests/read-non-seekable
+++ b/tests/read-non-seekable
@@ -5,7 +5,7 @@
# 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
diff --git a/tests/start b/tests/start
index df92a36..524b127 100755
--- a/tests/start
+++ b/tests/start
@@ -5,7 +5,7 @@
# 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
diff --git a/tests/undefine b/tests/undefine
index d9efbf7..f89a91e 100755
--- a/tests/undefine
+++ b/tests/undefine
@@ -5,7 +5,7 @@
# 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
diff --git a/tests/vcpupin b/tests/vcpupin
index 36dd093..5952862 100755
--- a/tests/vcpupin
+++ b/tests/vcpupin
@@ -5,7 +5,7 @@
# 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
diff --git a/tests/virsh-all b/tests/virsh-all
index baec161..8d60ac3 100755
--- a/tests/virsh-all
+++ b/tests/virsh-all
@@ -5,7 +5,7 @@
# 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
diff --git a/tests/virsh-schedinfo b/tests/virsh-schedinfo
index a2ec193..9d885ee 100755
--- a/tests/virsh-schedinfo
+++ b/tests/virsh-schedinfo
@@ -5,7 +5,7 @@
# 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
diff --git a/tests/virsh-synopsis b/tests/virsh-synopsis
index e60aeb5..59960fc 100755
--- a/tests/virsh-synopsis
+++ b/tests/virsh-synopsis
@@ -5,7 +5,7 @@
# 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
--
1.7.1.189.g07419