summaryrefslogtreecommitdiffstats
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2018-02-15 17:53:18 -0800
committerBrian Behlendorf <[email protected]>2018-05-29 16:00:33 -0700
commit93ce2b4ca5a40c41ac945cd3aaf4a4a22bb751e1 (patch)
tree6832f5c9dfdbe0f0bd5c8708344a769676b1f95d /COPYRIGHT
parent1272941f49321bcb7b26025670720c98785427ee (diff)
Update build system and packaging
Minimal changes required to integrate the SPL sources in to the ZFS repository build infrastructure and packaging. Build system and packaging: * Renamed SPL_* autoconf m4 macros to ZFS_*. * Removed redundant SPL_* autoconf m4 macros. * Updated the RPM spec files to remove SPL package dependency. * The zfs package obsoletes the spl package, and the zfs-kmod package obsoletes the spl-kmod package. * The zfs-kmod-devel* packages were updated to add compatibility symlinks under /usr/src/spl-x.y.z until all dependent packages can be updated. They will be removed in a future release. * Updated copy-builtin script for in-kernel builds. * Updated DKMS package to include the spl.ko. * Updated stale AUTHORS file to include all contributors. * Updated stale COPYRIGHT and included the SPL as an exception. * Renamed README.markdown to README.md * Renamed OPENSOLARIS.LICENSE to LICENSE. * Renamed DISCLAIMER to NOTICE. Required code changes: * Removed redundant HAVE_SPL macro. * Removed _BOOT from nvpairs since it doesn't apply for Linux. * Initial header cleanup (removal of empty headers, refactoring). * Remove SPL repository clone/build from zimport.sh. * Use of DEFINE_RATELIMIT_STATE and DEFINE_SPINLOCK removed due to build issues when forcing C99 compilation. * Replaced legacy ACCESS_ONCE with READ_ONCE. * Include needed headers for `current` and `EXPORT_SYMBOL`. Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: Olaf Faaland <[email protected]> Reviewed-by: Matthew Ahrens <[email protected]> Reviewed-by: Pavel Zakharov <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> TEST_ZIMPORT_SKIP="yes" Closes #7556
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT46
1 files changed, 17 insertions, 29 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 9b94f927f..54fbceade 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,39 +1,27 @@
-The majority of the code in the ZFS on Linux port comes from OpenSolaris
-which has been released under the terms of the CDDL open source license.
-This includes the core ZFS code, libavl, libnvpair, libefi, libunicode,
-and libutil. The original OpenSolaris source can be downloaded from:
-
-http://dlc.sun.com/osol/on/downloads/b121/on-src.tar.bz2
-
-Files which do not originate from OpenSolaris are noted in the file header
-and attributed properly. These exceptions include, but are not limited
-to, the vdev_disk.c and zvol.c implementation which are licensed under
-the CDDL.
-
-The latest stable and development versions of this port can be downloaded
-from the official ZFS on Linux site located at:
+Refer to the git commit log for authoritative copyright attribution.
-http://zfsonlinux.org/
+The original ZFS source code was obtained from Open Solaris which was
+released under the terms of the CDDL open source license. Additional
+changes have been included from OpenZFS and the Illumos project which
+are similarly licensed. These projects can be found on Github at:
-This ZFS on Linux port was produced at the Lawrence Livermore National
-Laboratory (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44)
-between the U.S. Department of Energy (DOE) and Lawrence Livermore
-National Security, LLC (LLNS) for the operation of LLNL. It has been
-approved for release under LLNL-CODE-403049.
+ * https://github.com/illumos/illumos-gate
+ * https://github.com/openzfs/openzfs
Unless otherwise noted, all files in this distribution are released
under the Common Development and Distribution License (CDDL).
-Exceptions are noted within the associated source files. A few notable
-exceptions and their respective licenses include:
-Skein Checksum Implementation: module/icp/algs/skein/THIRDPARTYLICENSE
-AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
-AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
-PBKDF2 Implementation: lib/libzfs/THIRDPARTYLICENSE.openssl
+Exceptions are noted within the associated source files headers and
+by including a THIRDPARTYLICENSE file with the license terms. A few
+notable exceptions and their respective licenses include:
+
+ * Skein Checksum Implementation: module/icp/algs/skein/THIRDPARTYLICENSE
+ * AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
+ * AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
+ * PBKDF2 Implementation: lib/libzfs/THIRDPARTYLICENSE.openssl
+ * SPL Implementation: module/spl/THIRDPARTYLICENSE.gplv2
This product includes software developed by the OpenSSL Project for use
in the OpenSSL Toolkit (http://www.openssl.org/)
-See the file OPENSOLARIS.LICENSE for more information.
-
-Refer to the git commit log for authoritative copyright attribution.
+See the LICENSE and NOTICE for more information.