Include all necessary licenses.

Including BSD-2-Clause and BSD-3-Clause for OpTEE OS.
Including BSD-2-Clause, BSD-3-Clause and PNG license for OpTEE userspace.

Change-Id: I5a3c4cdadb1273d5cf4a03b04ccdb0551c396364

diff --git a/LICENSE.BSD-3-Clause b/LICENSE.BSD-3-Clause
new file mode 100644 (file)
index 0000000..d0e3bbc
--- /dev/null
+++ b/LICENSE.BSD-3-Clause
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 1994-2009  Red Hat, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * 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 HOLDER 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/packaging/optee-os.spec b/packaging/optee-os.spec
index 7ebf7c2..ee1dd6e 100644 (file)
--- a/packaging/optee-os.spec
+++ b/packaging/optee-os.spec
@@ -3,7 +3,7 @@ Summary:    OpTEE OS with userspace libraries and devkit for OpTEE OS.
 Version:    2.4.0
 Release:    1%{?dist}
 Group:      Security/Testing
-License:    BSD-2-Clause
+License:    BSD and zlib
 URL:        https://github.com/OP-TEE/optee_os
 Source0:    %{name}-%{version}.tar.gz
 ExclusiveArch: armv6l armv7hl armv7l aarch64
@@ -65,6 +65,8 @@ make %{compile_flags} PLATFORM=rpi3
 make %{compile_flags} PLATFORM=s5p6818 out/arm-plat-s5p6818/core/tee.bin
 
 %install
+cp lib/libutils/isoc/arch/arm/softfloat/COPYING.txt LICENSE.BSD-3-Clause.mod
+
 %define buildplat rpi3
 %define plat_dir arm-plat-%{buildplat}
 mkdir -p %{buildroot}/boot/
@@ -82,11 +84,18 @@ cp -p out/%{plat_dir}/core/tee.bin %{buildroot}/boot/tee-artik.bin
 %clean
 
 %files -n optee-os-rpi3
+%license LICENSE
+%license LICENSE.BSD-3-Clause
 /boot/tee-pager.bin
 /boot/tee.bin
 
 %files ta
+%license LICENSE
+%license LICENSE.BSD-3-Clause
+%license LICENSE.BSD-3-Clause.mod
 /%{out_export_dir}/%{export_dir}
 
 %files -n optee-os-artik710
+%license LICENSE
+%license LICENSE.BSD-3-Clause
 /boot/tee-artik.bin