rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Trim EXTRAVERSION in the Makefile on CI builds"

Browse Source 
This reverts commit 89c7d2ae30, 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
This commit is contained in:
David Ward 2019-11-11 14:06:01 -05:00
parent c80c8a3afd
commit a86513b40e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel.spec
View File

@ -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}