[libvirt] [PATCH] tests: adjust copyrights on scripts: s/FSF/Red Hat/
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,/'
From c5be8bcb8f4b72a39481eeef58d601ec585e0c6f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering@redhat.com> Date: Tue, 11 May 2010 16:43:07 +0200 Subject: [PATCH] tests: adjust copyrights on scripts: s/FSF/Red Hat/
* tests/cpuset: Change copyright holder from FSF to Red Hat, Inc. * tests/read-bufsiz: Likewise. * tests/read-non-seekable: Likewise. * tests/start: Likewise. * tests/undefine: Likewise. * tests/vcpupin: Likewise. * tests/virsh-all: 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-synopsis | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/cpuset b/tests/cpuset index 89c19e0..3c48f0a 100755 --- a/tests/cpuset +++ b/tests/cpuset @@ -1,7 +1,7 @@ #!/bin/sh # ensure that defining with an invalid vCPU cpuset elicits a diagnostic -# Copyright (C) 2008-2009 Free Software Foundation, Inc. +# Copyright (C) 2008-2009 Red Hat, 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 diff --git a/tests/read-bufsiz b/tests/read-bufsiz index f4f8f19..3ebc135 100755 --- a/tests/read-bufsiz +++ b/tests/read-bufsiz @@ -1,7 +1,7 @@ #!/bin/sh # ensure that reading a file larger than BUFSIZ works -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008 Red Hat, 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 diff --git a/tests/read-non-seekable b/tests/read-non-seekable index 59c2389..1aed286 100755 --- a/tests/read-non-seekable +++ b/tests/read-non-seekable @@ -1,7 +1,7 @@ #!/bin/sh # ensure that certain file-reading commands can handle non-seekable files -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008 Red Hat, 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 diff --git a/tests/start b/tests/start index 930a6d9..df92a36 100755 --- a/tests/start +++ b/tests/start @@ -1,7 +1,7 @@ #!/bin/sh # ensure that virsh start works properly -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008 Red Hat, 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 diff --git a/tests/undefine b/tests/undefine index 48b0ad9..d9efbf7 100755 --- a/tests/undefine +++ b/tests/undefine @@ -1,7 +1,7 @@ #!/bin/sh # exercise virsh's "undefine" command -# Copyright (C) 2008-2009 Free Software Foundation, Inc. +# Copyright (C) 2008-2009 Red Hat, 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 diff --git a/tests/vcpupin b/tests/vcpupin index a72ad4c..36dd093 100755 --- a/tests/vcpupin +++ b/tests/vcpupin @@ -1,7 +1,7 @@ #!/bin/sh # ensure that an invalid CPU spec elicits a diagnostic -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008 Red Hat, 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 diff --git a/tests/virsh-all b/tests/virsh-all index f1eb82c..baec161 100755 --- a/tests/virsh-all +++ b/tests/virsh-all @@ -1,7 +1,7 @@ #!/bin/sh # blindly run each and every command listed by "virsh help" -# Copyright (C) 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009 Red Hat, 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 diff --git a/tests/virsh-synopsis b/tests/virsh-synopsis index d72e887..e60aeb5 100755 --- a/tests/virsh-synopsis +++ b/tests/virsh-synopsis @@ -1,7 +1,7 @@ #!/bin/sh # ensure that each command's help "SYNOPSIS" line starts with the command name -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008 Red Hat, 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 -- 1.7.1.189.g07419
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. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
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.
From what I recall, libvirt was made LGPLv2+ rather than LGPLv3 because some LGPLv2+ projects were expected to require it. Plus there was a general desire not to limit its adoption.
However, the tests are independent of all that, so I think it's ok that they be LGPLv3.
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. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
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@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
On Tue, 11 May 2010, 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,/'
ummm -- not to be pedantic here, but have you an assignment from the FSF to Red Hat, Inc of their part of the copyright before doing this? -- Russ herrold
On Tue, May 11, 2010 at 11:54:14AM -0400, R P Herrold wrote:
On Tue, 11 May 2010, 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,/'
ummm -- not to be pedantic here, but have you an assignment from the FSF to Red Hat, Inc of their part of the copyright before doing this?
It wasn't FSF code in the first place - it was all Red Hat code mistakenly labelled with FSF copyright through a cut+paste mistake. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
On Tue, 11 May 2010, Daniel P. Berrange wrote:
On Tue, May 11, 2010 at 11:54:14AM -0400, R P Herrold wrote:
cd tests && grep -l 'Copy.*Free.Sof' * |xargs perl -pi -e \ 's/Copyright \(C\) (.*) Free Software Foundation,/Copyright (C) $1 Red Hat,/'
ummm -- not to be pedantic here, but have you an assignment from the FSF to Red Hat, Inc of their part of the copyright before doing this?
It wasn't FSF code in the first place - it was all Red Hat code mistakenly labelled with FSF copyright through a cut+paste mistake.
ahh -- thanks
On 05/11/2010 09:54 AM, R P Herrold wrote:
On Tue, 11 May 2010, 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,/'
ummm -- not to be pedantic here, but have you an assignment from the FSF to Red Hat, Inc of their part of the copyright before doing this?
FSF never held the copyright. This was a copy-and-paste bug, where Jim created a new test using an FSF file as a template, then that test got copied into other tests. But the content of the tests is all unique to Red Had development, and Jim did the initial copy-and-paste typo while contributing to Red Hat. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
participants (4)
-
Daniel P. Berrange -
Eric Blake -
Jim Meyering -
R P Herrold