diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-05 19:59:10 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-05 19:59:10 +0200 |
| commit | d81e0b2f2ae9175dc1e1da62ffc539d4e6b7c850 (patch) | |
| tree | 9b04427efd3704c8bb075e3dedd3cc4964837b09 /kernel.spec | |
| parent | 9a91d33c5cdf8b932b0d96e8402a263b6714d607 (diff) | |
| parent | 73a194639b32ade20dacdf22a914ead178a69b06 (diff) | |
| download | kernel-d81e0b2f2ae9175dc1e1da62ffc539d4e6b7c850.tar.gz kernel-d81e0b2f2ae9175dc1e1da62ffc539d4e6b7c850.tar.xz kernel-d81e0b2f2ae9175dc1e1da62ffc539d4e6b7c850.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc6.git4.1.vanilla.knurd.1.fc30kernel-4.19.0-0.rc6.git4.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc6.git4.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc6.git4.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 4c03caa80..42761d3a6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 6 # The git snapshot level -%define gitrev 2 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1255,7 +1255,9 @@ BuildKernel() { %endif # make sure EXTRAVERSION says what we want it to say - perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}${Flav}/" Makefile + # Trim the release if this is a CI build, since KERNELVERSION is limited to 64 characters + ShortRel=$(python3 -c "import re; print(re.sub(r'\.pr\.[0-9A-Fa-f]{32}', '', '%{release}'))") + perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -${ShortRel}.%{_target_cpu}${Flav}/" Makefile # if pre-rc1 devel kernel, must fix up PATCHLEVEL for our versioning scheme %if !0%{?rcrev} @@ -1903,6 +1905,12 @@ fi # # %changelog +* Fri Oct 05 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc6.git4.1 +- Linux v4.19-rc6-223-gbefad944e231 + +* Thu Oct 04 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc6.git3.1 +- Linux v4.19-rc6-177-gcec4de302c5f + * Wed Oct 03 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc6.git2.1 - Linux v4.19-rc6-37-g6bebe37927f3 |