From d538930780d86e8527250f322a5af6a511c09fcf Mon Sep 17 00:00:00 2001 From: Dongqi Chen Date: Thu, 16 Apr 2020 14:34:37 +0800 Subject: [PATCH] Update qat driver sign method with 4.18 kernel from CentOS 8 (cherry picked from commit 3a347d0f7744d9df11af1f66b0dd1f3591dc8d4d) Story: 2007308 Task: 38807 Depends-On: https://review.opendev.org/720325 Change-Id: I78a913c23f3e99aa88c0b87311a4fe0f6f3f32af Signed-off-by: Shuicheng Lin Signed-off-by: Dongqi Chen --- kernel-modules/qat17/centos/build_srpm.data | 2 +- kernel-modules/qat17/centos/qat17.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel-modules/qat17/centos/build_srpm.data b/kernel-modules/qat17/centos/build_srpm.data index 868374fc..7c97b4a1 100644 --- a/kernel-modules/qat17/centos/build_srpm.data +++ b/kernel-modules/qat17/centos/build_srpm.data @@ -2,5 +2,5 @@ COPY_LIST=" \ $PKG_BASE/files/* \ $STX_BASE/downloads/qat1.7.l.4.5.0-00034.tar.gz \ " -TIS_PATCH_VER=1 +TIS_PATCH_VER=2 BUILD_IS_SLOW=3 diff --git a/kernel-modules/qat17/centos/qat17.spec b/kernel-modules/qat17/centos/qat17.spec index 8389b6e1..cd2325c7 100644 --- a/kernel-modules/qat17/centos/qat17.spec +++ b/kernel-modules/qat17/centos/qat17.spec @@ -112,10 +112,10 @@ find %{buildroot} -type f -name \*.ko -exec %{__strip} --strip-debug \{\} \; # Always Sign the modules(s). # If the module signing keys are not defined, define them here. -%{!?privkey: %define privkey /usr/src/kernels/%{kernel_version}/signing_key.priv} +%{!?privkey: %define privkey /usr/src/kernels/%{kernel_version}/signing_key.pem} %{!?pubkey: %define pubkey /usr/src/kernels/%{kernel_version}/signing_key.x509} for module in $(find %{buildroot} -type f -name \*.ko); -do %{__perl} /usr/src/kernels/%{kernel_version}/scripts/sign-file \ +do /usr/src/kernels/%{kernel_version}/scripts/sign-file \ sha256 %{privkey} %{pubkey} $module; done