svn commit: r332263 - in head: share/man/man4 sys/dev/vmware/vmci sys/modules/vmware/vmci
Rodney W. Grimes
freebsd at pdx.rh.CN85.dnsmgr.net
Sun Apr 8 02:05:07 UTC 2018
> Author: mp
> Date: Sun Apr 8 01:32:56 2018
> New Revision: 332263
> URL: https://svnweb.freebsd.org/changeset/base/332263
>
> Log:
> Update VMCI license based on comments from core, the FreeBSD Foundation,
> and VMware legal:
> - Add a dual BSD-2 Clause/GPLv2 LICENSE file in the VMCI directory
> - Remove the use of "All Rights Reserved"
> - Per best practice, remove copyright/license info from Makefile
>
> Reviewed by: imp, emaste, jhb, Vishnu Dasa <vdasa at vmware.com>
> Approved by: VMware legal via Mark Peek <markpeek at vmware.com>
> Differential Revision: https://reviews.freebsd.org/D14979
Interesting that I was the one that raised issue with this,
yet was not included in the diffential resolving it.
For an "inclusive" project it seems to do a lot of "exclusive" things.
> Added:
> head/sys/dev/vmware/vmci/LICENSE (contents, props changed)
> Modified:
> head/share/man/man4/vmci.4
...
So lets say someone comes along and reworks one of these files,
how does that person assert their copyright without asserting
it on all of these files, which is what would happen if they
did it in LICENSE.
If they put it in the individual file it is discoupled from the
clause that says "the above copyright", which they may or may
not want as with it decoupled there would be no requirement
to place this per file copyright notice per clause 1 and 2 in the end
product.
I still feel this is just an unworkable model for the long run.
I do however thank you for improving the situation, at least now
the "LICENSE" file is of complete form with a copyright above to
make clause 1 and 2 work correctly, as well as the other fine
nits repaired.
There is one other fine niglect though, and that is
the other SPDX work has the tags placed at the very top
of the file on the line after /*-. I think this is done
on intention for tooling, and is documented by exmaple
in the "8. Preferred License for New Files" section of the
committers-guide here:
https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/pref-license.html
Regards,
Rod Grimes
> Modified: head/share/man/man4/vmci.4
> ==============================================================================
> --- head/share/man/man4/vmci.4 Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/share/man/man4/vmci.4 Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,4 +1,4 @@
> -.\" Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> +.\" Copyright (c) 2018 VMware, Inc.
> .\"
> .\" SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> .\"
>
> Added: head/sys/dev/vmware/vmci/LICENSE
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/sys/dev/vmware/vmci/LICENSE Sun Apr 8 01:32:56 2018 (r332263)
> @@ -0,0 +1,51 @@
> +$FreeBSD$
> +
> +These files are provided under a dual BSD-2 Clause/GPLv2 license. When
> +using or redistributing this file, you may do so under either license.
> +
> +BSD-2 Clause License
> +
> +Copyright (c) 2018 VMware, Inc.
> +
> +Redistribution and use in source and binary forms, with or without
> +modification, are permitted provided that the following conditions
> +are met:
> +
> + * Redistributions of source code must retain the above copyright
> + notice, this list of conditions and the following disclaimer.
> +
> + * Redistributions in binary form must reproduce the above copyright
> + notice, this list of conditions and the following disclaimer in
> + the documentation and/or other materials provided with the
> + distribution.
> +
> +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +
> +GPL License Summary
> +
> +Copyright (c) 2018 VMware, Inc.
> +
> +This program is free software; you can redistribute it and/or modify
> +it under the terms of version 2 of the GNU General Public License as
> +published by the Free Software Foundation.
> +
> +This program is distributed in the hope that it will be useful, but
> +WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with this program; if not, write to the Free Software
> +Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
> +The full GNU General Public License is included in this distribution
> +in the file called LICENSE.GPL.
>
> Modified: head/sys/dev/vmware/vmci/vmci.c
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci.c Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci.c Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> */
>
> Modified: head/sys/dev/vmware/vmci/vmci.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_call_defs.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_call_defs.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_call_defs.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_datagram.c
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_datagram.c Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_datagram.c Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> */
>
> Modified: head/sys/dev/vmware/vmci/vmci_datagram.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_datagram.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_datagram.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_defs.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_defs.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_defs.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_doorbell.c
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_doorbell.c Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_doorbell.c Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> */
>
> Modified: head/sys/dev/vmware/vmci/vmci_doorbell.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_doorbell.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_doorbell.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_driver.c
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_driver.c Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_driver.c Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> */
>
> Modified: head/sys/dev/vmware/vmci/vmci_driver.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_driver.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_driver.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_event.c
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_event.c Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_event.c Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> */
>
> Modified: head/sys/dev/vmware/vmci/vmci_event.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_event.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_event.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_hashtable.c
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_hashtable.c Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_hashtable.c Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> */
>
> Modified: head/sys/dev/vmware/vmci/vmci_hashtable.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_hashtable.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_hashtable.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_kernel_api.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_kernel_api.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_kernel_api.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_kernel_api_1.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_kernel_api_1.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_kernel_api_1.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_kernel_api_2.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_kernel_api_2.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_kernel_api_2.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_kernel_defs.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_kernel_defs.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_kernel_defs.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_kernel_if.c
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_kernel_if.c Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_kernel_if.c Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> */
>
> Modified: head/sys/dev/vmware/vmci/vmci_kernel_if.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_kernel_if.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_kernel_if.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_qpair.c
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_qpair.c Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_qpair.c Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> */
>
> Modified: head/sys/dev/vmware/vmci/vmci_queue.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_queue.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_queue.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_queue_pair.c
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_queue_pair.c Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_queue_pair.c Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> */
>
> Modified: head/sys/dev/vmware/vmci/vmci_queue_pair.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_queue_pair.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_queue_pair.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_resource.c
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_resource.c Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_resource.c Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> */
>
> Modified: head/sys/dev/vmware/vmci/vmci_resource.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_resource.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_resource.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/dev/vmware/vmci/vmci_utils.h
> ==============================================================================
> --- head/sys/dev/vmware/vmci/vmci_utils.h Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/dev/vmware/vmci/vmci_utils.h Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,5 +1,5 @@
> /*-
> - * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> + * Copyright (c) 2018 VMware, Inc.
> *
> * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> *
>
> Modified: head/sys/modules/vmware/vmci/Makefile
> ==============================================================================
> --- head/sys/modules/vmware/vmci/Makefile Sun Apr 8 00:56:19 2018 (r332262)
> +++ head/sys/modules/vmware/vmci/Makefile Sun Apr 8 01:32:56 2018 (r332263)
> @@ -1,8 +1,3 @@
> -#
> -# Copyright (c) 2018 VMware, Inc. All Rights Reserved.
> -#
> -# SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
> -#
> # $FreeBSD$
>
> .PATH: ${SRCTOP}/sys/dev/vmware/vmci
>
>
--
Rod Grimes rgrimes at freebsd.org
More information about the svn-src-all
mailing list