Daos 6338 SWLC: Change DAOS license text #7

Jenkinsfile

@@ -4,7 +4,7 @@
  *
  * This file is part of the DAOS Project. It is subject to the license terms
  * in the LICENSE file found in the top-level directory of this distribution
- * and at https://img.shields.io/badge/License-Apache%202.0-blue.svg.
+ * and at https://img.shields.io/badge/License-BSD--2--Clause--Patent-blue.svg.
  * No part of the DAOS Project, including this file, may be copied, modified,
  * propagated, or distributed except according to the terms contained in the
  * LICENSE file.

debian/changelog

@@ -1,3 +1,9 @@
+daos (1.1.2.1-8) unstable; urgency=medium
+  [ Hua Kuang ]
+  * Changed License to BSD-2-Clause-Patent
+
+ -- Hua Kuang <[email protected]> Wed, 3 Feb 2021 16:59:34 -0000
+
 daos (1.1.2.1-7) unstable; urgency=medium
   [ Alexander Oganezov ]
   * Fix debian packages to update to mercury v2.0.1rc1

debian/copyright

@@ -1,11 +1,11 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: cart
-Source: https://github.com/daos-stack/cart
+Upstream-Name: daos
+Source: https://github.com/daos-stack/daos
 
 Files: *
-Copyright: Copyright 2016-2019 Intel Corporation <[email protected]>
-License: Intel_Open_Source_License
- Copyright (C) 2016-2019 Intel Corporation
+Copyright: Copyright 2016-2021 Intel Corporation <[email protected]>
+License: BSD-2-Clause-Patent
+ Copyright (C) 2016-2021 Intel Corporation
  All rights reserved.
  .
  Redistribution and use in source and binary forms, with or without
@@ -41,24 +41,3 @@ License: Intel_Open_Source_License
  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.
-
-# If you want to use GPL v2 or later for the /debian/* files use
-# the following clauses, or change it to suit. Delete these two lines
-Files: debian/*
-Copyright: 2019 daos-stack <[email protected]>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package 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, see <https://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

utils/rpms/daos.spec

@@ -6,10 +6,10 @@
 
 Name:          daos
 Version:       1.1.2.1
-Release:       7%{?relval}%{?dist}
+Release:       8%{?relval}%{?dist}
 Summary:       DAOS Storage Engine
 
-License:       Apache
+License:       BSD-2-Clause-Patent
 URL:           https//github.com/daos-stack/daos
 Source0:       %{name}-%{version}.tar.gz
 
@@ -409,6 +409,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 %{_libdir}/*.a
 
 %changelog
+* Wed Feb 3 2021 Hua Kuang <[email protected]> 1.1.2.1-8
+- Changed License to BSD-2-Clause-Patent
+
 * Thu Jan 28 2021 Phillip Henderson <[email protected]> 1.1.2.1-7
 - Change ownership and permissions for the /etc/daos/certs directory.