diff --git a/Makefile.rhelver b/Makefile.rhelver index 9d14db1..c2fb584 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.1 +RTBUILD:=.2 diff --git a/kernel.spec b/kernel.spec index 7a6a525..0736b00 100755 --- a/kernel.spec +++ b/kernel.spec @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc1.163.rt9.1 +%define pkgrelease 0.rc1.163.rt9.2 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.163.rt9.1%{?buildid}%{?dist} +%define specrelease 0.rc1.163.rt9.2%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -627,7 +627,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12.0-0.rc1.163.rt9.1.tar.xz +Source0: linux-5.12.0-0.rc1.163.rt9.2.tar.xz Source1: Makefile.rhelver @@ -1003,6 +1003,11 @@ Summary: Kernel samples and selftests License: GPLv2 Requires: binutils, bpftool, iproute-tc, nmap-ncat Requires: %{name}-modules-internal = %{version}-%{release} +%if %{with_realtime} +Conflicts: kernel-selftests-internal +%else +Conflicts: kernel-rt-selftests-internal +%endif %description selftests-internal Kernel sample programs and selftests. @@ -1310,8 +1315,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12.0-0.rc1.163.rt9.1 -c -mv linux-5.12.0-0.rc1.163.rt9.1 linux-%{KVERREL} +%setup -q -n kernel-5.12.0-0.rc1.163.rt9.2 -c +mv linux-5.12.0-0.rc1.163.rt9.2 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2880,7 +2885,7 @@ fi # # %changelog -* Fri Mar 05 2021 Juri Lelli [5.12.0-0.rc1.163.rt9.1] +* Wed Mar 10 2021 Juri Lelli [5.12.0-0.rc1.163.rt9.2] - kernel-5.12.0-0.rc1.20210304gitf69d02e37a85.163 rebase - spec: Generate separate kernel-rt-kvm packages (Juri Lelli) - Add RT config options (Juri Lelli) diff --git a/sources b/sources index b84fee0..86c9e40 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.12.0-0.rc1.163.rt9.1.tar.xz) = f8e8d5156050ef0c79409939991f7a853cfedca48cfbbade89ceac6b207c7d1a26647ed0d5fddd17390eb1c0f3369ac99311862e53c543bc854e37131f9422a4 -SHA512 (kernel-abi-whitelists-5.12.0-0.rc1.163.tar.bz2) = 6aca797eb830d9355db2370ad9929a543127be8d9ade95f300617bc273c2f1a11e18885b1a97d03dc36530c7b21c577a9ae6481bbf2bfe486ebec0a0d25e227d -SHA512 (kernel-kabi-dw-5.12.0-0.rc1.163.tar.bz2) = c45f2271ecababa6fce3c21e9db764252dcd361ea3f6703fec8133fe256ee24233b8c8d54dc426431a72c4a06e3e1cfe164bf18bc23fdcce7446479b664cebde +SHA512 (linux-5.12.0-0.rc1.163.rt9.2.tar.xz) = e927000bcba57bb7c807d2e447d2b678482a8b57286efcea893ce367b2961366364ee3789ea05731868cfe5f89ea1679645f2197ffb5f56fc0bbcad84d8c0ef6 +SHA512 (kernel-abi-whitelists-5.12.0-0.rc1.163.tar.bz2) = 2945234b8d10ac25f09887b963ac8722f8a9f90d505c4862c18328239131761f6c0436a5bb333d5ce8555f1f0a9ff44839f4dc468f48b9cf9da2e5210fce1980 +SHA512 (kernel-kabi-dw-5.12.0-0.rc1.163.tar.bz2) = a1822100f266ff7ace8d8ee5d57a46aaea98e386963882fb92e1b6e292197a33af202e1991e42d8d250de9864524d1e663821b6c55d4806129a02318b4fc8137