diff --git a/0001-ci-kernel-version-patch.patch b/0001-ci-kernel-version-patch.patch new file mode 100644 index 0000000..eaeeb1a --- /dev/null +++ b/0001-ci-kernel-version-patch.patch @@ -0,0 +1,57 @@ +From 0ddd65d2c3d16c9991439279f2f781364dfd6ebe Mon Sep 17 00:00:00 2001 +From: z00590711 +Date: Sat, 12 Feb 2022 16:12:34 +0800 +Subject: [PATCH] ci kernel version patch + +--- + Makefile | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 3cb5a30..bf9e27c 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,8 @@ +-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; \ + else \ +- echo /lib/modules/`uname -r`/build; \ ++ echo /lib/modules/5.10*/build; \ + fi) + + obj-m += uacce/ +@@ -28,8 +28,8 @@ defaul: + # cp -f $(shell pwd)/include_uapi_linux/uacce.h $(KSP)/include/uapi/linux + + 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 \;) + 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; \ +@@ -50,11 +50,11 @@ uninstall: + modprobe -r hisi_sec2 + modprobe -r hisi_qm + modprobe -r uacce +- rm -rf /lib/modules/`uname -r`/extra/uacce.ko +- rm -rf /lib/modules/`uname -r`/extra/hisi_qm.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_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 /etc/modprobe.d/hisi_sec2.conf + rm -rf /etc/modprobe.d/hisi_hpre.conf + rm -rf /etc/modprobe.d/hisi_zip.conf +-- +2.35.0.windows.1 + diff --git a/CI_fail_kernel_version.patch b/CI_fail_kernel_version.patch deleted file mode 100644 index cf8b296..0000000 --- a/CI_fail_kernel_version.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Naur kae_driver/Makefile kae_driver_diff/Makefile ---- kae_driver/Makefile 2022-02-12 09:36:47.569212700 +0800 -+++ kae_driver_diff/Makefile 2022-02-12 15:54:27.239858800 +0800 -@@ -1,4 +1,4 @@ --KERNEL_PATH := /lib/modules/`uname -r`/build -+KERNEL_PATH := /lib/modules/5.10*/build - KSP := $(shell if test -d /lib/modules/`uname -r`/source; then \ - echo /lib/modules/`uname -r`/source; \ - else \ diff --git a/kae_driver.spec b/kae_driver.spec index 0c4a443..7815d5d 100644 --- a/kae_driver.spec +++ b/kae_driver.spec @@ -14,7 +14,7 @@ Conflicts: %{name} < %{version}-%{release} Provides: %{name} = %{version}-%{release} BuildRequires: kernel-devel, gcc, make ExclusiveArch: aarch64 -Patch0001: CI_fail_kernel_version.patch +Patch0001: 0001-ci-kernel-version-patch.patch %define kernel_version %(uname -r) %define kae_driver_path %{_builddir}/%{name}-%{version}/%{name}