diff options
| author | David Ward <david.ward@ll.mit.edu> | 2019-11-11 14:06:01 -0500 |
|---|---|---|
| committer | David Ward <david.ward@ll.mit.edu> | 2019-11-11 14:06:01 -0500 |
| commit | a86513b40ec92203cf73c27feed0f4045db15634 (patch) | |
| tree | 69be34120fa26554182dd5166880cd63a56b4661 | |
| parent | c80c8a3afd2f6a93173bce96595f3bb01de08089 (diff) | |
| download | kernel-a86513b40ec92203cf73c27feed0f4045db15634.tar.gz kernel-a86513b40ec92203cf73c27feed0f4045db15634.tar.xz kernel-a86513b40ec92203cf73c27feed0f4045db15634.zip | |
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
| -rw-r--r-- | kernel.spec | 4 |
1 files changed, 1 insertions, 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} |