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@vmware.com> Approved by: VMware legal via Mark Peek <markpeek@vmware.com> Differential Revision: https://reviews.freebsd.org/D14979
svn path=/head/; revision=332263
2018-04-08 01:32:56 +00:00 · 2018-04-08 01:32:56 +00:00 · 3eeb751122 · 2020-12-20 02:59:44 +00:00
commit 3eeb751122
parent 91cc58af37
30 changed files with 79 additions and 33 deletions
--- a/share/man/man4/vmci.4
+++ b/share/man/man4/vmci.4
@ -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)
 .\"
--- a/sys/dev/vmware/vmci/LICENSE
+++ b/sys/dev/vmware/vmci/LICENSE
@ -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.
--- a/sys/dev/vmware/vmci/vmci.c
+++ b/sys/dev/vmware/vmci/vmci.c
@ -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)
 */
--- a/sys/dev/vmware/vmci/vmci.h
+++ b/sys/dev/vmware/vmci/vmci.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_call_defs.h
+++ b/sys/dev/vmware/vmci/vmci_call_defs.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_datagram.c
+++ b/sys/dev/vmware/vmci/vmci_datagram.c
@ -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)
 */
--- a/sys/dev/vmware/vmci/vmci_datagram.h
+++ b/sys/dev/vmware/vmci/vmci_datagram.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_defs.h
+++ b/sys/dev/vmware/vmci/vmci_defs.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_doorbell.c
+++ b/sys/dev/vmware/vmci/vmci_doorbell.c
@ -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)
 */
--- a/sys/dev/vmware/vmci/vmci_doorbell.h
+++ b/sys/dev/vmware/vmci/vmci_doorbell.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_driver.c
+++ b/sys/dev/vmware/vmci/vmci_driver.c
@ -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)
 */
--- a/sys/dev/vmware/vmci/vmci_driver.h
+++ b/sys/dev/vmware/vmci/vmci_driver.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_event.c
+++ b/sys/dev/vmware/vmci/vmci_event.c
@ -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)
 */
--- a/sys/dev/vmware/vmci/vmci_event.h
+++ b/sys/dev/vmware/vmci/vmci_event.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_hashtable.c
+++ b/sys/dev/vmware/vmci/vmci_hashtable.c
@ -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)
 */
--- a/sys/dev/vmware/vmci/vmci_hashtable.h
+++ b/sys/dev/vmware/vmci/vmci_hashtable.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_kernel_api.h
+++ b/sys/dev/vmware/vmci/vmci_kernel_api.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_kernel_api_1.h
+++ b/sys/dev/vmware/vmci/vmci_kernel_api_1.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_kernel_api_2.h
+++ b/sys/dev/vmware/vmci/vmci_kernel_api_2.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_kernel_defs.h
+++ b/sys/dev/vmware/vmci/vmci_kernel_defs.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_kernel_if.c
+++ b/sys/dev/vmware/vmci/vmci_kernel_if.c
@ -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)
 */
--- a/sys/dev/vmware/vmci/vmci_kernel_if.h
+++ b/sys/dev/vmware/vmci/vmci_kernel_if.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_qpair.c
+++ b/sys/dev/vmware/vmci/vmci_qpair.c
@ -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)
 */
--- a/sys/dev/vmware/vmci/vmci_queue.h
+++ b/sys/dev/vmware/vmci/vmci_queue.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_queue_pair.c
+++ b/sys/dev/vmware/vmci/vmci_queue_pair.c
@ -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)
 */
--- a/sys/dev/vmware/vmci/vmci_queue_pair.h
+++ b/sys/dev/vmware/vmci/vmci_queue_pair.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_resource.c
+++ b/sys/dev/vmware/vmci/vmci_resource.c
@ -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)
 */
--- a/sys/dev/vmware/vmci/vmci_resource.h
+++ b/sys/dev/vmware/vmci/vmci_resource.h
@ -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)
 *
--- a/sys/dev/vmware/vmci/vmci_utils.h
+++ b/sys/dev/vmware/vmci/vmci_utils.h
@ -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)
 *
--- a/sys/modules/vmware/vmci/Makefile
+++ b/sys/modules/vmware/vmci/Makefile
@ -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