Merge optee-os-ta-devel-rpi3.spec with optee-os-rpi3.spec

Change-Id: I45b717f1fe40e3eadb71cef8e54304abc2f21684

diff --git a/packaging/optee-os-rpi3.spec b/packaging/optee-os-rpi3.spec
index 62334808160b8ee8b4245b73d4146cc9082ab5f0..f91c664f295fff85f063442e07d6d8e0dfee17a1 100644 (file)
--- a/packaging/optee-os-rpi3.spec
+++ b/packaging/optee-os-rpi3.spec
@@ -3,11 +3,14 @@
 %if %{__isa_bits} == 64
 %define compile_arch %{compile_flags} CFG_ARM64_core=y
 %else
-%define compile_arch %{compile_flags}
+%define compile_arch %{compile_flags} CFG_WITH_VFP=n
 %endif
+%define out_dir out/arm-plat-%{buildplat}
+%define export_dir export-ta_arm%{__isa_bits}
+%define out_export_dir opt/optee/
 
 Name:       optee-os
-Summary:    OPTEE trusted operation system.
+Summary:    OpTEE OS with userspace libraries and devkit for OpTEE OS.
 Version:    2.4.0
 Release:    1%{?dist}
 Group:      Security/Testing
@@ -18,6 +21,7 @@ ExclusiveArch: armv6l armv7hl armv7l aarch64
 
 Provides:   tee-pager.bin
 Provides:   tee.bin
+Provides:   optee-os-ta
 
 BuildRequires: make
 BuildRequires: python
@@ -26,20 +30,32 @@ BuildRequires: openssl
 %description
 Trusted execution enviroment in Linux using the ARM® TrustZone® technology.
 
+%files
+/boot/tee-pager.bin
+/boot/tee.bin
+
 %prep
 %setup -q
 
 %build
-make %{compile_arch} out/arm-plat-%{buildplat}/core/tee.bin
+make %{compile_arch}
 
 %install
 mkdir -p %{buildroot}/boot/
+mkdir -p %{buildroot}/%{out_export_dir}
 
 cp -p %{_builddir}/%{name}-%{version}/out/arm-plat-%{buildplat}/core/tee-pager.bin %{buildroot}/boot/
 cp -p %{_builddir}/%{name}-%{version}/out/arm-plat-%{buildplat}/core/tee.bin %{buildroot}/boot/
+cp -rf %{_builddir}/%{name}-%{version}/%{out_dir}/%{export_dir} %{buildroot}/%{out_export_dir}/
 
 %clean
 
-%files
-/boot/tee-pager.bin
-/boot/tee.bin
+%package ta
+Summary:    OpTEE OS userspace libraries and devkit for OpTEE OS.
+Group:      Security/Testing
+
+%description ta
+Trusted execution enviroment in Linux using the ARM® TrustZone® technology.
+
+%files ta
+/%{out_export_dir}/%{export_dir}

diff --git a/packaging/optee-os-ta-devel-rpi3.spec b/packaging/optee-os-ta-devel-rpi3.spec
deleted file mode 100644 (file)
index 50ed230..0000000
--- a/packaging/optee-os-ta-devel-rpi3.spec
+++ /dev/null
@@ -1,77 +0,0 @@
-%define buildplat rpi3
-%define compile_flags CROSS_COMPILE="" CROSS_COMPILE64="" PLATFORM=%{buildplat} CFLAGS=-lgcc_eh CFG_LIBUTEE_TUI=n CFG_TEE_CORE_LOG_LEVEL=3 DEBUG=0
-%if %{__isa_bits} == 64
-%define compile_arch %{compile_flags} CFG_ARM64_core=y
-%else
-%define compile_arch %{compile_flags} CFG_WITH_VFP=n
-%endif
-%define out_dir out/arm-plat-%{buildplat}
-%define out_lib_dir %{out_dir}/ta_arm%{__isa_bits}-lib
-%define export_dir export-ta_arm%{__isa_bits}
-%define out_export_dir opt/optee/%{export_dir}
-
-Name:       optee-os-ta
-Summary:    Userspace libraries and devkit for OpTEE OS.
-Version:    2.4.0
-Release:    1%{?dist}
-Group:      Security/Testing
-License:    BSD-2-Clause
-URL:        https://github.com/OP-TEE/optee_os
-Source0:    %{name}-%{version}.tar.gz
-ExclusiveArch: armv6l armv7hl armv7l aarch64
-
-Provides:   %{name}
-
-BuildRequires: make
-BuildRequires: python
-BuildRequires: openssl
-
-%description
-Trusted execution enviroment in Linux using the ARM® TrustZone® technology.
-
-%prep
-%setup -q
-
-%build
-mkdir -p %{out_dir}/%{export_dir}/mk
-make %{compile_arch} %{out_lib_dir}/libutee/libutee.a %{out_lib_dir}/libmpa/libmpa.a %{out_lib_dir}/libpng/libpng.a %{out_lib_dir}/libzlib/libzlib.a %{out_lib_dir}/libutils/libutils.a %{out_dir}/%{export_dir}/mk/conf.mk 
-
-%install
-mkdir -p %{buildroot}/%{out_export_dir}/mk
-mkdir -p %{buildroot}/%{out_export_dir}/lib
-mkdir -p %{buildroot}/%{out_export_dir}/src
-mkdir -p %{buildroot}/%{out_export_dir}/scripts
-mkdir -p %{buildroot}/%{out_export_dir}/keys
-mkdir -p %{buildroot}/%{out_export_dir}/host_include
-mkdir -p %{buildroot}/%{out_export_dir}/include
-
-find %{_builddir}/%{name}-%{version}/%{out_lib_dir}/ -name lib*.a | xargs cp -t %{buildroot}/%{out_export_dir}/lib
-
-cp %{_builddir}/%{name}-%{version}/%{out_dir}/%{export_dir}/mk/conf.mk %{buildroot}/%{out_export_dir}/mk/
-cp %{_builddir}/%{name}-%{version}/mk/compile.mk %{buildroot}/%{out_export_dir}/mk/
-cp %{_builddir}/%{name}-%{version}/mk/subdir.mk %{buildroot}/%{out_export_dir}/mk/
-cp %{_builddir}/%{name}-%{version}/mk/gcc.mk %{buildroot}/%{out_export_dir}/mk/
-cp %{_builddir}/%{name}-%{version}/mk/cleandirs.mk %{buildroot}/%{out_export_dir}/mk/
-cp %{_builddir}/%{name}-%{version}/ta/arch/arm/link.mk %{buildroot}/%{out_export_dir}/mk/
-cp %{_builddir}/%{name}-%{version}/ta/mk/ta_dev_kit.mk %{buildroot}/%{out_export_dir}/mk/
-
-cp %{_builddir}/%{name}-%{version}/ta/arch/arm/*.S %{buildroot}/%{out_export_dir}/src/
-cp %{_builddir}/%{name}-%{version}/ta/arch/arm/user_ta_header.c %{buildroot}/%{out_export_dir}/src/
-
-cp %{_builddir}/%{name}-%{version}/scripts/sign.py %{buildroot}/%{out_export_dir}/scripts/
-
-cp %{_builddir}/%{name}-%{version}/keys/default_ta.pem %{buildroot}/%{out_export_dir}/keys/
-
-cp -rf %{_builddir}/%{name}-%{version}/lib/libutee/include/*  %{buildroot}/%{out_export_dir}/host_include/
-cp -rf %{_builddir}/%{name}-%{version}/lib/libmpa/include/*  %{buildroot}/%{out_export_dir}/host_include/
-cp -rf %{_builddir}/%{name}-%{version}/lib/libpng/include/*  %{buildroot}/%{out_export_dir}/host_include/
-cp -rf %{_builddir}/%{name}-%{version}/lib/libzlib/include/*  %{buildroot}/%{out_export_dir}/host_include/
-
-cp -rf %{buildroot}/%{out_export_dir}/host_include/*  %{buildroot}/%{out_export_dir}/include/
-cp -rf %{_builddir}/%{name}-%{version}/lib/libutils/ext/include/*  %{buildroot}/%{out_export_dir}/include/
-cp -rf %{_builddir}/%{name}-%{version}/lib/libutils/isoc/include/*  %{buildroot}/%{out_export_dir}/include/
-
-%clean
-
-%files
-/%{out_export_dir}