From eb7d81fea72759ca27b8e8cb60adae579d9b1b7f Mon Sep 17 00:00:00 2001 From: chenzheng Date: Mon, 9 Sep 2024 14:38:55 +0000 Subject: [PATCH] bugfix: weak-modules cannot create soft link in cvm (cherry picked from commit f20b0906a23d12a76ad71432e91aa40af16771ad) --- virtCCA_driver.spec | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/virtCCA_driver.spec b/virtCCA_driver.spec index 5ec3c28..f201a96 100644 --- a/virtCCA_driver.spec +++ b/virtCCA_driver.spec @@ -5,7 +5,7 @@ Name : virtCCA_driver Summary : virtCCA driver is some drivers for TEE specific function. Version : 0.1.3 -Release : 5 +Release : 6 ExclusiveArch: aarch64 License : GPLV2 Group : System/Kernel @@ -44,32 +44,42 @@ rm -rf %{buildroot} %post if [[ "$1" = "1" || "$1" = "2" ]] ; then - echo "installing %{kmod_1_name}.ko" - if [ -e /sbin/weak-modules ] ; then - echo "/lib/modules/%{kernel}/extra/%{kmod_1_name}.ko" | /sbin/weak-modules --add-module --no-initramfs + echo "installing virtCCA driver" + install_dir="/lib/modules/%{kernel}/extra" + link_dir="/lib/modules/$(uname -r)/extra" + if [ "$install_dir" != "$link_dir" ] ; then + 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" fi - echo "installed %{kmod_1_name}.ko" + echo "installed virtCCA driver" fi %postun if [[ "$1" = "0" ]] ; then - echo "removing %{kmod_1_name}.ko" - if [ -e /sbin/weak-modules ] ; then - echo "/lib/modules/%{kernel}/extra/%{kmod_1_name}.ko" | /sbin/weak-modules --remove-module --no-initramfs + 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" fi - echo "removed %{kmod_1_name}.ko" + echo "removed virtCCA driver" fi %changelog +* Mon Sep 9 2024 chenzheng - 0.1.3-6 +- Type:bugfix +- DESC:weak-modules cannot create soft link in cvm + * Mon Jul 15 2024 tujipei - 0.1.3-5 - Type:bugfix - DESC:Use weak-modules to decouple kernel modules from kernel versions -* Mon June 3 2024 tujipei - 0.1.3-4 +* Mon Jun 3 2024 tujipei - 0.1.3-4 - Type:bugfix - DESC:Clean the scanned security problem for the sealing key code -* Mon June 3 2024 tujipei - 0.1.2-3 +* Mon Jun 3 2024 tujipei - 0.1.2-3 - Type:bugfix - DESC:Fit class_create for different kernel version -- Gitee