From a86513b40ec92203cf73c27feed0f4045db15634 Mon Sep 17 00:00:00 2001 From: David Ward Date: Mon, 11 Nov 2019 14:06:01 -0500 Subject: [PATCH] Revert "Trim EXTRAVERSION in the Makefile on CI builds" This reverts commit 89c7d2ae30a43ba2960ce14cddd50f8d8a7da92f, which was causing kernel modules to be installed in a location other than /lib/modules/$(uname -r), preventing modprobe from locating them. CI builds no longer contain the Pagure UID in the package release: https://github.com/CentOS-PaaS-SIG/upstream-fedora-pipeline/pull/199 --- kernel.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel.spec b/kernel.spec index 5d4f938fe..14e349b10 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1427,9 +1427,7 @@ BuildKernel() { %endif # make sure EXTRAVERSION says what we want it to say - # Trim the release if this is a CI build, since KERNELVERSION is limited to 64 characters - ShortRel=$(perl -e "print \"%{release}\" =~ s/\.pr\.[0-9A-Fa-f]{32}//r") - perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -${ShortRel}.%{_target_cpu}${Flav}/" Makefile + perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}${Flav}/" Makefile # if pre-rc1 devel kernel, must fix up PATCHLEVEL for our versioning scheme %if !0%{?rcrev}