!19 [sync] PR-17: bugfix: fix compile error and change sealing key interface parameter

From: @openeuler-sync-bot 
Reviewed-by: @lixiaomingg 
Signed-off-by: @lixiaomingg

virtCCA_driver.spec

@@ -4,8 +4,8 @@
 #
 Name         :  virtCCA_driver
 Summary      :  virtCCA driver is some drivers for TEE specific function.
-Version      :  0.1.3
+Version      :  0.1.8
-Release      :  4
+Release      :  1
 ExclusiveArch:  aarch64
 License      :  GPLV2
 Group        :  System/Kernel
@@ -13,12 +13,13 @@ URL          :  https://gitee.com/openeuler/virtCCA_driver.git
 Source0      :  https://gitee.com/openeuler/virtCCA_driver/repository/archive/%{name}-v%{version}.tar.gz
 BuildRoot    :  %{_tmppath}/%{name}-v%{release}-build
 BuildRequires:	gcc kernel-devel kernel-headers kernel glibc glibc-devel glib2-devel cmake rpm
+Requires     :  kmod
 
 %global debug_package   %{nil}
 %define kmod_1_name     tmm_driver
 %define kmod_2_name     sealing_key
+%define kmod_3_name     kae_driver
 %define kernel          %(ver=`rpm -qa|grep kernel-devel`;echo ${ver#*kernel-devel-})
-%define drivers_path    /usr/lib/modules/%{kernel}/kernel/drivers
 
 %description
 %{name} module
@@ -31,32 +32,85 @@ cd %_builddir/%{name}-v%{version}/
 make KERNEL_DIR=/usr/src/kernels/%{kernel}
 
 %install
-mkdir -p %{buildroot}/lib/modules/%{name}
+mkdir -p %{buildroot}/lib/modules/%{kernel}/extra
-install -m 0640 %_builddir/%{name}-v%{version}/%{kmod_1_name}/src/%{kmod_1_name}.ko        %{buildroot}/lib/modules/%{name}
+install -m 0640 %_builddir/%{name}-v%{version}/%{kmod_1_name}/src/%{kmod_1_name}.ko        %{buildroot}/lib/modules/%{kernel}/extra
-install -m 0640 %_builddir/%{name}-v%{version}/%{kmod_2_name}/src/%{kmod_2_name}.ko        %{buildroot}/lib/modules/%{name}
+install -m 0640 %_builddir/%{name}-v%{version}/%{kmod_2_name}/src/%{kmod_2_name}.ko        %{buildroot}/lib/modules/%{kernel}/extra
+install -m 0640 %_builddir/%{name}-v%{version}/%{kmod_3_name}/hisi_plat_qm.ko        %{buildroot}/lib/modules/%{kernel}/extra
+install -m 0640 %_builddir/%{name}-v%{version}/%{kmod_3_name}/hisi_plat_sec.ko        %{buildroot}/lib/modules/%{kernel}/extra
+install -m 0640 %_builddir/%{name}-v%{version}/%{kmod_3_name}/hisi_plat_hpre.ko        %{buildroot}/lib/modules/%{kernel}/extra
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%attr(0640,root,root) /lib/modules/%{name}/*
+%attr(0640,root,root) /lib/modules/%{kernel}/extra/*
 
 %post
-mkdir -p %{drivers_path}/%{name}
+if [[ "$1" = "1" || "$1" = "2" ]] ; then
-cp /lib/modules/%{name}/* %{drivers_path}/%{name}
+    echo "installing virtCCA driver"
-depmod %{kernel}
+    install_dir="/lib/modules/%{kernel}/extra"
+    link_dir="/lib/modules/$(uname -r)/extra"
+    if [ "$install_dir" != "$link_dir" ] ; then
+        mkdir -p $link_dir
+        ln -sf "$install_dir/%{kmod_1_name}.ko"  "$link_dir/%{kmod_1_name}.ko"
+        ln -sf "$install_dir/%{kmod_2_name}.ko"  "$link_dir/%{kmod_2_name}.ko"
+        ln -sf "$install_dir/hisi_plat_qm.ko"  "$link_dir/hisi_plat_qm.ko"
+        ln -sf "$install_dir/hisi_plat_sec.ko"  "$link_dir/hisi_plat_sec.ko"
+        ln -sf "$install_dir/hisi_plat_hpre.ko"  "$link_dir/hisi_plat_hpre.ko"
+    fi
+    echo "installed virtCCA driver"
+fi
 
 %postun
-rm -rf %{drivers_path}/%{name}
+if [[ "$1" = "0" ]] ; then
-depmod %{kernel}
+    echo "removing virtCCA driver"
+    link_dir="/lib/modules/$(uname -r)/extra"
+    install_dir="/lib/modules/%{kernel}/extra"
+    if [ "$install_dir" != "$link_dir" ] ; then
+        rm -rf "$link_dir/%{kmod_1_name}.ko"
+        rm -rf "$link_dir/%{kmod_2_name}.ko"
+        rm -rf "$link_dir/hisi_plat_qm.ko"
+        rm -rf "$link_dir/hisi_plat_sec.ko"
+        rm -rf "$link_dir/hisi_plat_hpre.ko"
+    fi
+    echo "removed virtCCA driver"
+fi
 
 %changelog
-* Mon June 3 2024 tujipei<tujipei@huawei.com> - 0.1.3-4
+* Mon Dec 2 2024 chenzheng<chenzheng71@huawei.com> - 0.1.8-1
+- Type:bugfix
+- DESC:fix compile error and change sealing key interface parameter for avoid ambiguity
+
+* Mon Nov 11 2024 yuzexi<yuzexi@hisilicon.com> - 0.1.6-1
+- Type:bugfix
+- DESC:fix compile error
+
+* Thu Nov 7 2024 yuzexi<yuzexi@hisilicon.com> - 0.1.5-1
+- Type:bugfix
+- DESC:modify platform driver according to comments
+
+* Tue Sep 10 2024 yuzexi<yuzexi@hisilicon.com> - 0.1.4-1
+- Type:enhancement
+- DESC:Add kae driver for virtCCA guest
+
+* Tue Sep 10 2024 chenzheng<chenzheng71@huawei.com> - 0.1.3-7
+- Type:bugfix
+- DESC:mkdir extra dir while kernel version not equal
+
+* Mon Sep 9 2024 chenzheng<chenzheng71@huawei.com> - 0.1.3-6
+- Type:bugfix
+- DESC:weak-modules cannot create soft link in cvm
+
+* Mon Jul 15 2024 tujipei<tujipei@huawei.com> - 0.1.3-5
+- Type:bugfix
+- DESC:Use weak-modules to decouple kernel modules from kernel versions
+
+* Mon Jun 3 2024 tujipei<tujipei@huawei.com> - 0.1.3-4
 - Type:bugfix
 - DESC:Clean the scanned security problem for the sealing key code
 
-* Mon June 3 2024 tujipei<tujipei@huawei.com> - 0.1.2-3
+* Mon Jun 3 2024 tujipei<tujipei@huawei.com> - 0.1.2-3
 - Type:bugfix
 - DESC:Fit class_create for different kernel version