From fe417ad0efdf365d5438ae46904118fa27ae38b8 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Fri, 19 Jun 2020 11:41:35 +0000 Subject: [PATCH] 12853 bhyve manifests should include BSD license Reviewed by: Patrick Mooney Approved by: Dan McDonald --- exception_lists/copyright | 10 +++++++ usr/src/cmd/bhyve/THIRDPARTYLICENSE | 26 +++++++++++++++++++ usr/src/cmd/bhyve/THIRDPARTYLICENSE.descrip | 1 + usr/src/cmd/bhyvectl/THIRDPARTYLICENSE | 26 +++++++++++++++++++ .../cmd/bhyvectl/THIRDPARTYLICENSE.descrip | 1 + usr/src/contrib/bhyve/THIRDPARTYLICENSE | 26 +++++++++++++++++++ .../contrib/bhyve/THIRDPARTYLICENSE.descrip | 1 + usr/src/lib/libvmmapi/THIRDPARTYLICENSE | 26 +++++++++++++++++++ .../lib/libvmmapi/THIRDPARTYLICENSE.descrip | 1 + usr/src/pkg/manifests/system-bhyve.mf | 2 ++ usr/src/pkg/manifests/system-library-bhyve.mf | 2 ++ usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE | 26 +++++++++++++++++++ .../i86pc/io/viona/THIRDPARTYLICENSE.descrip | 1 + usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE | 26 +++++++++++++++++++ .../i86pc/io/vmm/THIRDPARTYLICENSE.descrip | 1 + 15 files changed, 176 insertions(+) create mode 100644 usr/src/cmd/bhyve/THIRDPARTYLICENSE create mode 100644 usr/src/cmd/bhyve/THIRDPARTYLICENSE.descrip create mode 100644 usr/src/cmd/bhyvectl/THIRDPARTYLICENSE create mode 100644 usr/src/cmd/bhyvectl/THIRDPARTYLICENSE.descrip create mode 100644 usr/src/contrib/bhyve/THIRDPARTYLICENSE create mode 100644 usr/src/contrib/bhyve/THIRDPARTYLICENSE.descrip create mode 100644 usr/src/lib/libvmmapi/THIRDPARTYLICENSE create mode 100644 usr/src/lib/libvmmapi/THIRDPARTYLICENSE.descrip create mode 100644 usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE create mode 100644 usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE.descrip create mode 100644 usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE create mode 100644 usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE.descrip diff --git a/exception_lists/copyright b/exception_lists/copyright index d9f0b4fdf618..8cabc8570265 100644 --- a/exception_lists/copyright +++ b/exception_lists/copyright @@ -468,6 +468,8 @@ usr/src/uts/common/sys/scsi/adapters/mpt_sas/mpi/* usr/src/uts/sparc/nsmb/ioc_check.ref # bhyve sources +usr/src/cmd/bhyve/THIRDPARTYLICENSE +usr/src/cmd/bhyve/THIRDPARTYLICENSE.descrip usr/src/cmd/bhyve/acpi.[ch] usr/src/cmd/bhyve/ahci.h usr/src/cmd/bhyve/atkbdc.[ch] @@ -518,10 +520,16 @@ usr/src/cmd/bhyve/usb_mouse.c usr/src/cmd/bhyve/vga.[ch] usr/src/cmd/bhyve/virtio.[ch] usr/src/cmd/bhyve/xmsr.[ch] +usr/src/cmd/bhyvectl/THIRDPARTYLICENSE +usr/src/cmd/bhyvectl/THIRDPARTYLICENSE.descrip usr/src/cmd/bhyvectl/bhyvectl.c usr/src/compat/bhyve/* usr/src/contrib/bhyve/* +usr/src/lib/libvmmapi/THIRDPARTYLICENSE +usr/src/lib/libvmmapi/THIRDPARTYLICENSE.descrip usr/src/lib/libvmmapi/common/vmmapi.[ch] +usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE +usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE.descrip usr/src/uts/i86pc/io/vmm/amd/*.[chs] usr/src/uts/i86pc/io/vmm/intel/*.[chs] usr/src/uts/i86pc/io/vmm/intel/offsets.in @@ -549,3 +557,5 @@ usr/src/cmd/bhyve/README.license usr/src/cmd/bhyvectl/README.license usr/src/lib/libvmmapi/README.license usr/src/uts/i86pc/io/vmm/README.license +usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE +usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE.descrip diff --git a/usr/src/cmd/bhyve/THIRDPARTYLICENSE b/usr/src/cmd/bhyve/THIRDPARTYLICENSE new file mode 100644 index 000000000000..66b39dc9508a --- /dev/null +++ b/usr/src/cmd/bhyve/THIRDPARTYLICENSE @@ -0,0 +1,26 @@ + +SPDX-License-Identifier: BSD-2-Clause-FreeBSD + +Copyright (c) 1992-2020 The FreeBSD Project. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. 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 AUTHOR 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 AUTHOR 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. + diff --git a/usr/src/cmd/bhyve/THIRDPARTYLICENSE.descrip b/usr/src/cmd/bhyve/THIRDPARTYLICENSE.descrip new file mode 100644 index 000000000000..77026fc8a3ed --- /dev/null +++ b/usr/src/cmd/bhyve/THIRDPARTYLICENSE.descrip @@ -0,0 +1 @@ +Bhyve hypervisor diff --git a/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE b/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE new file mode 100644 index 000000000000..66b39dc9508a --- /dev/null +++ b/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE @@ -0,0 +1,26 @@ + +SPDX-License-Identifier: BSD-2-Clause-FreeBSD + +Copyright (c) 1992-2020 The FreeBSD Project. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. 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 AUTHOR 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 AUTHOR 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. + diff --git a/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE.descrip b/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE.descrip new file mode 100644 index 000000000000..77026fc8a3ed --- /dev/null +++ b/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE.descrip @@ -0,0 +1 @@ +Bhyve hypervisor diff --git a/usr/src/contrib/bhyve/THIRDPARTYLICENSE b/usr/src/contrib/bhyve/THIRDPARTYLICENSE new file mode 100644 index 000000000000..66b39dc9508a --- /dev/null +++ b/usr/src/contrib/bhyve/THIRDPARTYLICENSE @@ -0,0 +1,26 @@ + +SPDX-License-Identifier: BSD-2-Clause-FreeBSD + +Copyright (c) 1992-2020 The FreeBSD Project. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. 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 AUTHOR 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 AUTHOR 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. + diff --git a/usr/src/contrib/bhyve/THIRDPARTYLICENSE.descrip b/usr/src/contrib/bhyve/THIRDPARTYLICENSE.descrip new file mode 100644 index 000000000000..77026fc8a3ed --- /dev/null +++ b/usr/src/contrib/bhyve/THIRDPARTYLICENSE.descrip @@ -0,0 +1 @@ +Bhyve hypervisor diff --git a/usr/src/lib/libvmmapi/THIRDPARTYLICENSE b/usr/src/lib/libvmmapi/THIRDPARTYLICENSE new file mode 100644 index 000000000000..66b39dc9508a --- /dev/null +++ b/usr/src/lib/libvmmapi/THIRDPARTYLICENSE @@ -0,0 +1,26 @@ + +SPDX-License-Identifier: BSD-2-Clause-FreeBSD + +Copyright (c) 1992-2020 The FreeBSD Project. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. 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 AUTHOR 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 AUTHOR 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. + diff --git a/usr/src/lib/libvmmapi/THIRDPARTYLICENSE.descrip b/usr/src/lib/libvmmapi/THIRDPARTYLICENSE.descrip new file mode 100644 index 000000000000..77026fc8a3ed --- /dev/null +++ b/usr/src/lib/libvmmapi/THIRDPARTYLICENSE.descrip @@ -0,0 +1 @@ +Bhyve hypervisor diff --git a/usr/src/pkg/manifests/system-bhyve.mf b/usr/src/pkg/manifests/system-bhyve.mf index 002bef64cc40..450f83954af1 100644 --- a/usr/src/pkg/manifests/system-bhyve.mf +++ b/usr/src/pkg/manifests/system-bhyve.mf @@ -52,6 +52,8 @@ file path=usr/sbin/bhyvectl mode=0555 file path=usr/sbin/pptadm mode=0555 file path=usr/share/man/man1m/pptadm.1m license lic_CDDL license=lic_CDDL +license usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE \ + license=usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE depend fmri=developer/acpi type=require depend fmri=system/bhyve/firmware type=require depend fmri=system/library/bhyve type=require diff --git a/usr/src/pkg/manifests/system-library-bhyve.mf b/usr/src/pkg/manifests/system-library-bhyve.mf index 5408778c909c..f425c8303444 100644 --- a/usr/src/pkg/manifests/system-library-bhyve.mf +++ b/usr/src/pkg/manifests/system-library-bhyve.mf @@ -33,3 +33,5 @@ file path=lib/$(ARCH64)/libvmmapi.so.1 file path=usr/lib/$(ARCH64)/libppt.so.1 file path=usr/lib/libppt.so.1 license lic_CDDL license=lic_CDDL +license usr/src/lib/libvmmapi/THIRDPARTYLICENSE \ + license=usr/src/lib/libvmmapi/THIRDPARTYLICENSE diff --git a/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE b/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE new file mode 100644 index 000000000000..66b39dc9508a --- /dev/null +++ b/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE @@ -0,0 +1,26 @@ + +SPDX-License-Identifier: BSD-2-Clause-FreeBSD + +Copyright (c) 1992-2020 The FreeBSD Project. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. 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 AUTHOR 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 AUTHOR 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. + diff --git a/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE.descrip b/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE.descrip new file mode 100644 index 000000000000..77026fc8a3ed --- /dev/null +++ b/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE.descrip @@ -0,0 +1 @@ +Bhyve hypervisor diff --git a/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE b/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE new file mode 100644 index 000000000000..66b39dc9508a --- /dev/null +++ b/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE @@ -0,0 +1,26 @@ + +SPDX-License-Identifier: BSD-2-Clause-FreeBSD + +Copyright (c) 1992-2020 The FreeBSD Project. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. 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 AUTHOR 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 AUTHOR 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. + diff --git a/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE.descrip b/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE.descrip new file mode 100644 index 000000000000..77026fc8a3ed --- /dev/null +++ b/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE.descrip @@ -0,0 +1 @@ +Bhyve hypervisor