From d404dd1dada72214e33eeaa67edc8dd96c36c05c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 18 May 2010 10:08:29 -0700 Subject: [PATCH 1/3] Minor spec file cleanup for srpm case. Ensure kpkg is defined is srpm case before using it to define the krequires macro. Interestingly this is not an issue for rpm-4.7.1-4 but it is for rpm-4.4.2.3-18. --- zfs-modules.spec.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zfs-modules.spec.in b/zfs-modules.spec.in index 836813ae5e..c08b59fd4f 100644 --- a/zfs-modules.spec.in +++ b/zfs-modules.spec.in @@ -22,7 +22,7 @@ %define kobj %{require_kobj} %endif -# SLES 10, SLES 11: +# SLES: %if %{defined suse_version} %if %{undefined kver} %ifarch ppc64 @@ -104,7 +104,7 @@ %endif %else -# Fedora 11: +# Fedora: %if %{defined fedora} %if %{undefined kver} %define klnk %{_usrsrc}/kernels/*/include/config @@ -186,7 +186,9 @@ # final RPM should be keyed to the kernel version it was built against. %if %{defined build_src_rpm} %define release @ZFS_META_RELEASE@ +%if %{defined kpkg} %define krequires %{kpkg} +%endif %define splrequires %{splpkg} %else %define relext %(echo %{kverpkg} | %{__sed} -e 's/-/_/g') From 91ac110c9ce29fcf81625cea81876b958564d384 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 18 May 2010 10:32:23 -0700 Subject: [PATCH 2/3] Update COPYRIGHT and DISCLAIMER. Update the COPYRIGHT and DISCLAIMER in an attempt to be clear about the copyright and licensing issues. --- COPYRIGHT | 16 ++++++++++++---- DISCLAIMER | 36 +++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 2ca1599458..1123393f73 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,14 @@ -The bulk of the library is Copyright 2004 Sun Microsystems, Inc. -Portions are Copyright 2006 OmniTI, Inc. +The majority of the code is this project comes from OpenSolaris which +has been released under 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: -The library is distributed under the terms of the CDDL. -See the file OPENSOLARIS.LICENSE for more information. +http://dlc.sun.com/osol/on/downloads/b121/on-src.tar.bz2 +Files which do not originate from OpenSolaris are noted by a header +and attributed properly. These exceptions include but are not limited +to the vdev_disk.c and zvol.c implementation which are also licensed +under the CDDL. + +This package is distributed under the terms of the CDDL. See the file +OPENSOLARIS.LICENSE for more information. diff --git a/DISCLAIMER b/DISCLAIMER index 86778c593f..1bb04be7eb 100644 --- a/DISCLAIMER +++ b/DISCLAIMER @@ -1,22 +1,24 @@ -This notice is required to be provided under our contract with the -U.S. Department of Energy (DOE). This work was produced at the -Lawrence Livermore National Laboratory under Contract with the DOE. +This work 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. -Neither the United States Government nor the Lawrence Livermore National -Security, LLC. nor any of their employees, makes any warranty, express -or implied, or assumes any liability or responsibility for the accuracy, -completeness, or usefulness of any information, apparatus, product, -or process disclosed, or represents that its use would not infringe -privately-owned rights. +This work was prepared as an account of work sponsored by an agency of +the United States Government. Neither the United States Government nor +Lawrence Livermore National Security, LLC nor any of their employees, +makes any warranty, express or implied, or assumes any liability or +responsibility for the accuracy, completeness, or usefulness of any +information, apparatus, product, or process disclosed, or represents +that its use would not infringe privately-owned rights. -Also, reference herein to any specific commercial products, process, -or services by trade name, trademark, manufacturer or otherwise does +Reference herein to any specific commercial products, process, or +services by trade name, trademark, manufacturer or otherwise does not necessarily constitute or imply its endorsement, recommendation, -or favoring by the United States Government or the Lawrence Livermore -National Security, LLC. The views and opinions of authors expressed -herein do not necessarily state or reflect those of the United States -Government or the Lawrence Livermore National Security, LLC., and -shall not be used for advertising or product endorsement purposes. +or favoring by the United States Government or Lawrence Livermore +National Security, LLC. The views and opinions of authors expressed +herein do not necessarily state or reflect those of the Untied States +Government or Lawrence Livermore National Security, LLC, and shall +not be used for advertising or product endorsement purposes. -The precise terms and conditions for copying, distribution and +The precise terms and conditions for copying, distribution, and modification are specified in the file "COPYING". From 1ccca52c354cf842cb6b5668b2ca69ec9ae0911e Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 18 May 2010 10:42:54 -0700 Subject: [PATCH 3/3] Resolve conflict --- COPYRIGHT | 16 ++++++++++++++-- DISCLAIMER | 36 +++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 50dcc09e32..1123393f73 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,2 +1,14 @@ -The library is distributed under the terms of the CDDL. -See the file OPENSOLARIS.LICENSE for more information. +The majority of the code is this project comes from OpenSolaris which +has been released under 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 by a header +and attributed properly. These exceptions include but are not limited +to the vdev_disk.c and zvol.c implementation which are also licensed +under the CDDL. + +This package is distributed under the terms of the CDDL. See the file +OPENSOLARIS.LICENSE for more information. diff --git a/DISCLAIMER b/DISCLAIMER index 86778c593f..1bb04be7eb 100644 --- a/DISCLAIMER +++ b/DISCLAIMER @@ -1,22 +1,24 @@ -This notice is required to be provided under our contract with the -U.S. Department of Energy (DOE). This work was produced at the -Lawrence Livermore National Laboratory under Contract with the DOE. +This work 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. -Neither the United States Government nor the Lawrence Livermore National -Security, LLC. nor any of their employees, makes any warranty, express -or implied, or assumes any liability or responsibility for the accuracy, -completeness, or usefulness of any information, apparatus, product, -or process disclosed, or represents that its use would not infringe -privately-owned rights. +This work was prepared as an account of work sponsored by an agency of +the United States Government. Neither the United States Government nor +Lawrence Livermore National Security, LLC nor any of their employees, +makes any warranty, express or implied, or assumes any liability or +responsibility for the accuracy, completeness, or usefulness of any +information, apparatus, product, or process disclosed, or represents +that its use would not infringe privately-owned rights. -Also, reference herein to any specific commercial products, process, -or services by trade name, trademark, manufacturer or otherwise does +Reference herein to any specific commercial products, process, or +services by trade name, trademark, manufacturer or otherwise does not necessarily constitute or imply its endorsement, recommendation, -or favoring by the United States Government or the Lawrence Livermore -National Security, LLC. The views and opinions of authors expressed -herein do not necessarily state or reflect those of the United States -Government or the Lawrence Livermore National Security, LLC., and -shall not be used for advertising or product endorsement purposes. +or favoring by the United States Government or Lawrence Livermore +National Security, LLC. The views and opinions of authors expressed +herein do not necessarily state or reflect those of the Untied States +Government or Lawrence Livermore National Security, LLC, and shall +not be used for advertising or product endorsement purposes. -The precise terms and conditions for copying, distribution and +The precise terms and conditions for copying, distribution, and modification are specified in the file "COPYING".