From 9f31e11ac653038e34f63716bdbe281e16cb9400 Mon Sep 17 00:00:00 2001 From: Zhang Zhiguo Date: Thu, 28 Nov 2019 02:17:20 -0500 Subject: [PATCH] CentOS 8: Upgrade intel-e1000e to version 3.6.0 Fix spec file for centos 8: (1) Changed the signatures of the modules method, because sign-file on centos 8 is not a perl script, but an executable command. The file extension of the private key was changed from priv to pem. (2)Upgrade tarball version from 3.4.2.1 to 3.6.0, because the old version is missing support to build against CentOS 8. Change-Id: I592ca3b2a6287bc3b10532228b34d0095fa536be Story: 2006728 Task: 37662 Depends-On: https://review.opendev.org/#/c/695134/ Depends-On: https://review.opendev.org/#/c/696481/ Depends-On: https://review.opendev.org/#/c/696050/ Signed-off-by: Zhang Zhiguo --- kernel/kernel-modules/intel-e1000e/centos/build_srpm.data | 2 +- kernel/kernel-modules/intel-e1000e/centos/e1000e-kmod.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/kernel-modules/intel-e1000e/centos/build_srpm.data b/kernel/kernel-modules/intel-e1000e/centos/build_srpm.data index ea6ffa8c8..e6494a52e 100644 --- a/kernel/kernel-modules/intel-e1000e/centos/build_srpm.data +++ b/kernel/kernel-modules/intel-e1000e/centos/build_srpm.data @@ -1,4 +1,4 @@ COPY_LIST=" \ $PKG_BASE/files/* \ - $STX_BASE/downloads/e1000e-3.4.2.1.tar.gz" + $STX_BASE/downloads/e1000e-3.6.0.tar.gz" TIS_PATCH_VER=1 diff --git a/kernel/kernel-modules/intel-e1000e/centos/e1000e-kmod.spec b/kernel/kernel-modules/intel-e1000e/centos/e1000e-kmod.spec index a3985e7de..5f99403e3 100644 --- a/kernel/kernel-modules/intel-e1000e/centos/e1000e-kmod.spec +++ b/kernel/kernel-modules/intel-e1000e/centos/e1000e-kmod.spec @@ -8,7 +8,7 @@ %define kmod_name e1000e Name: %{kmod_name}-kmod%{?bt_ext} -Version: 3.4.2.1 +Version: 3.6.0 Release: 0%{?_tis_dist}.%{tis_patch_ver} Group: System Environment/Kernel License: GPLv2 @@ -109,10 +109,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/%{kversion}/signing_key.priv} +%{!?privkey: %define privkey /usr/src/kernels/%{kversion}/signing_key.pem} %{!?pubkey: %define pubkey /usr/src/kernels/%{kversion}/signing_key.x509} for module in $(find %{buildroot} -type f -name \*.ko); -do %{__perl} /usr/src/kernels/%{kversion}/scripts/sign-file \ +do /usr/src/kernels/%{kversion}/scripts/sign-file \ sha256 %{privkey} %{pubkey} $module; done