packages/kae_driver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!30 patch文件里版本号没有适配

Browse Source 
From: @MasterMaYunHui 
Reviewed-by: @realzhongkeyi 
Signed-off-by: @realzhongkeyi
This commit is contained in:
openeuler-ci-bot 2023-02-08 03:47:47 +00:00 committed by Gitee
commit d905dd9f77
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
0001-ci-kernel-version-patch.patch
View File

@ -15,12 +15,12 @@ index 3cb5a30..bf9e27c 100644
-KERNEL_PATH := /lib/modules/`uname -r`/build -KERNEL_PATH := /lib/modules/`uname -r`/build
-KSP := $(shell if test -d /lib/modules/`uname -r`/source; then \ -KSP := $(shell if test -d /lib/modules/`uname -r`/source; then \
- echo /lib/modules/`uname -r`/source; \ - echo /lib/modules/`uname -r`/source; \
+KERNEL_PATH := /lib/modules/5.10*/build +KERNEL_PATH := /lib/modules/6.1*/build
+KSP := $(shell if test -d /lib/modules/5.10*/source; then \ +KSP := $(shell if test -d /lib/modules/6.1*/source; then \
+ echo /lib/modules/5.10*/source; \ + echo /lib/modules/6.1*/source; \
else \ else \
- echo /lib/modules/`uname -r`/build; \ - echo /lib/modules/`uname -r`/build; \
+ echo /lib/modules/5.10*/build; \ + echo /lib/modules/6.1*/build; \
fi) fi)
obj-m += uacce/ obj-m += uacce/
@ -30,8 +30,8 @@ index 3cb5a30..bf9e27c 100644
install: install:
- $(shell mkdir -p /lib/modules/`uname -r`/extra) - $(shell mkdir -p /lib/modules/`uname -r`/extra)
- $(shell find . -name "*.ko" -exec cp -f {} /lib/modules/`uname -r`/extra \;) - $(shell find . -name "*.ko" -exec cp -f {} /lib/modules/`uname -r`/extra \;)
+ $(shell mkdir -p /lib/modules/5.10*/extra) + $(shell mkdir -p /lib/modules/6.1*/extra)
+ $(shell find . -name "*.ko" -exec cp -f {} /lib/modules/5.10*/extra \;) + $(shell find . -name "*.ko" -exec cp -f {} /lib/modules/6.1*/extra \;)
depmod -a depmod -a
$(shell if test -e /etc/modprobe.d/10-unsupported-modules.conf; then \ $(shell if test -e /etc/modprobe.d/10-unsupported-modules.conf; then \
sed -i "s/^allow_unsupported_modules.*/allow_unsupported_modules 1/" /etc/modprobe.d/10-unsupported-modules.conf; \ sed -i "s/^allow_unsupported_modules.*/allow_unsupported_modules 1/" /etc/modprobe.d/10-unsupported-modules.conf; \
@ -44,11 +44,11 @@ index 3cb5a30..bf9e27c 100644
- rm -rf /lib/modules/`uname -r`/extra/hisi_sec2.ko - rm -rf /lib/modules/`uname -r`/extra/hisi_sec2.ko
- rm -rf /lib/modules/`uname -r`/extra/hisi_hpre.ko - rm -rf /lib/modules/`uname -r`/extra/hisi_hpre.ko
- rm -rf /lib/modules/`uname -r`/extra/hisi_zip.ko - rm -rf /lib/modules/`uname -r`/extra/hisi_zip.ko
+ rm -rf /lib/modules/5.10*/extra/uacce.ko + rm -rf /lib/modules/6.1*/extra/uacce.ko
+ rm -rf /lib/modules/5.10*/extra/hisi_qm.ko + rm -rf /lib/modules/6.1*/extra/hisi_qm.ko
+ rm -rf /lib/modules/5.10*/extra/hisi_sec2.ko + rm -rf /lib/modules/6.1*/extra/hisi_sec2.ko
+ rm -rf /lib/modules/5.10*/extra/hisi_hpre.ko + rm -rf /lib/modules/6.1*/extra/hisi_hpre.ko
+ rm -rf /lib/modules/5.10*/extra/hisi_zip.ko + rm -rf /lib/modules/6.1*/extra/hisi_zip.ko
rm -rf /etc/modprobe.d/hisi_sec2.conf rm -rf /etc/modprobe.d/hisi_sec2.conf
rm -rf /etc/modprobe.d/hisi_hpre.conf rm -rf /etc/modprobe.d/hisi_hpre.conf
rm -rf /etc/modprobe.d/hisi_zip.conf rm -rf /etc/modprobe.d/hisi_zip.conf

3
kae_driver.spec
View File

@ -232,6 +232,9 @@ echo "hisi_trng_v2 modules uninstalled"
%config(noreplace) /etc/modprobe.d/hisi_trng_v2.conf %config(noreplace) /etc/modprobe.d/hisi_trng_v2.conf
%changelog %changelog
* Tue Feb 7 2023 mayunhui <mayunhui3@huawei.com> - 2.0.1
- Fix kae_driver build error in the patch file
* Wed Nov 11 2020 wangyue <wangyue92@huawei.com> - 1.3.9-1 * Wed Nov 11 2020 wangyue <wangyue92@huawei.com> - 1.3.9-1
- Fix kae_driver build error on kernel 5.10 - Fix kae_driver build error on kernel 5.10