From b9d496b9d2c1b9582f2ceef4400c881ff2de4de2 Mon Sep 17 00:00:00 2001 From: HUI Date: Tue, 7 Feb 2023 11:32:14 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: HUI --- 0001-ci-kernel-version-patch.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/0001-ci-kernel-version-patch.patch b/0001-ci-kernel-version-patch.patch index 047e011..ff522cc 100644 --- a/0001-ci-kernel-version-patch.patch +++ b/0001-ci-kernel-version-patch.patch @@ -15,12 +15,12 @@ index 3cb5a30..bf9e27c 100644 -KERNEL_PATH := /lib/modules/`uname -r`/build -KSP := $(shell if test -d /lib/modules/`uname -r`/source; then \ - echo /lib/modules/`uname -r`/source; \ -+KERNEL_PATH := /lib/modules/5.10*/build -+KSP := $(shell if test -d /lib/modules/5.10*/source; then \ -+ echo /lib/modules/5.10*/source; \ ++KERNEL_PATH := /lib/modules/6.1*/build ++KSP := $(shell if test -d /lib/modules/6.1*/source; then \ ++ echo /lib/modules/6.1*/source; \ else \ - echo /lib/modules/`uname -r`/build; \ -+ echo /lib/modules/5.10*/build; \ ++ echo /lib/modules/6.1*/build; \ fi) obj-m += uacce/ @@ -30,8 +30,8 @@ index 3cb5a30..bf9e27c 100644 install: - $(shell mkdir -p /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 find . -name "*.ko" -exec cp -f {} /lib/modules/5.10*/extra \;) ++ $(shell mkdir -p /lib/modules/6.1*/extra) ++ $(shell find . -name "*.ko" -exec cp -f {} /lib/modules/6.1*/extra \;) depmod -a $(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; \ @@ -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_hpre.ko - rm -rf /lib/modules/`uname -r`/extra/hisi_zip.ko -+ rm -rf /lib/modules/5.10*/extra/uacce.ko -+ rm -rf /lib/modules/5.10*/extra/hisi_qm.ko -+ rm -rf /lib/modules/5.10*/extra/hisi_sec2.ko -+ rm -rf /lib/modules/5.10*/extra/hisi_hpre.ko -+ rm -rf /lib/modules/5.10*/extra/hisi_zip.ko ++ rm -rf /lib/modules/6.1*/extra/uacce.ko ++ rm -rf /lib/modules/6.1*/extra/hisi_qm.ko ++ rm -rf /lib/modules/6.1*/extra/hisi_sec2.ko ++ rm -rf /lib/modules/6.1*/extra/hisi_hpre.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_hpre.conf rm -rf /etc/modprobe.d/hisi_zip.conf -- Gitee From 008e2fc513e4803b0da8de4ddcaa3c6b4129d48c Mon Sep 17 00:00:00 2001 From: HUI Date: Tue, 7 Feb 2023 13:14:38 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=84=E7=90=86patch=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=87=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E4=B8=8D=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: HUI --- kae_driver.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kae_driver.spec b/kae_driver.spec index e8e11c1..aaa8e79 100644 --- a/kae_driver.spec +++ b/kae_driver.spec @@ -232,6 +232,9 @@ echo "hisi_trng_v2 modules uninstalled" %config(noreplace) /etc/modprobe.d/hisi_trng_v2.conf %changelog +* Tue Feb 7 2023 mayunhui +- Fix kae_driver build error in the patch file + * Wed Nov 11 2020 wangyue - 1.3.9-1 - Fix kae_driver build error on kernel 5.10 -- Gitee From 302325b9ccffe0897a97e46fd8860c8b340ff626 Mon Sep 17 00:00:00 2001 From: HUI Date: Tue, 7 Feb 2023 13:16:24 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BA=86patch=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=87=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E4=B8=8D=E9=80=82?= =?UTF-8?q?=E9=85=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: HUI --- kae_driver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kae_driver.spec b/kae_driver.spec index aaa8e79..17d6b58 100644 --- a/kae_driver.spec +++ b/kae_driver.spec @@ -232,7 +232,7 @@ echo "hisi_trng_v2 modules uninstalled" %config(noreplace) /etc/modprobe.d/hisi_trng_v2.conf %changelog -* Tue Feb 7 2023 mayunhui +* Tue Feb 7 2023 mayunhui - 2.0.1 - Fix kae_driver build error in the patch file * Wed Nov 11 2020 wangyue - 1.3.9-1 -- Gitee