diff --git a/kernel-tools.spec b/kernel-tools.spec index c5ca563..12539d5 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -4,7 +4,7 @@ # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 1 +%global released_kernel 0 %global baserelease 1 %global fedora_build %{baserelease} @@ -13,6 +13,8 @@ # which yields a base_sublevel of 0. %global base_sublevel 19 +%global base_major 5 + ## If this is a released kernel ## %if 0%{?released_kernel} @@ -23,17 +25,19 @@ %global stablerev %{stable_update} %global stable_base %{stable_update} %endif -%global rpmversion 5.%{base_sublevel}.%{stable_update} +%global rpmversion %{base_major}.%{base_sublevel}.%{stable_update} ## The not-released-kernel case ## %else # The next upstream release sublevel (base_sublevel+1) -%global upstream_sublevel %(echo $((%{base_sublevel} + 1))) +# %global upstream_sublevel %(echo $((%{base_sublevel} + 1))) +%global upstream_sublevel 0 +%global upstream_major 6 # The rc snapshot level -%global rcrev 0 +%global rcrev 1 # Set rpm version accordingly -%global rpmversion 5.%{upstream_sublevel}.0 +%global rpmversion %{upstream_major}.%{upstream_sublevel}.0 %endif # Nb: The above rcrev values automagically define Patch00 and Patch01 below. @@ -56,7 +60,7 @@ %endif # The kernel tarball/base version -%global kversion 5.%{base_sublevel} +%global kversion %{base_major}.%{base_sublevel} %global KVERREL %{version}-%{release}.%{_target_cpu} # perf needs this @@ -68,7 +72,7 @@ BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: zlib-devel binutils-devel newt-devel python3-docutils perl(ExtUtils::Embed) bison flex xz-devel BuildRequires: audit-libs-devel glibc-devel glibc-headers glibc-static python3-devel java-devel -BuildRequires: asciidoc xmlto libcap-devel +BuildRequires: asciidoc xmlto libcap-devel python3-setuptools BuildRequires: openssl-devel libbabeltrace-devel BuildRequires: libtracefs-devel libtraceevent-devel BuildRequires: libbpf-devel @@ -100,13 +104,13 @@ Source2001: cpupower.config # For a stable release kernel %if 0%{?stable_base} -Source5000: patch-5.%{base_sublevel}.%{stable_base}.xz +Source5000: patch-%{base_major}.%{base_sublevel}.%{stable_base}.xz %else # non-released_kernel case # These are automagically defined by the rcrev value set up # near the top of this spec file. %if 0%{?rcrev} -Source5000: patch-5.%{upstream_sublevel}-rc%{rcrev}.xz +Source5000: patch-%{upstream_major}.%{upstream_sublevel}-rc%{rcrev}.xz %endif %endif @@ -532,6 +536,9 @@ popd %{_mandir}/man1/rtla.1.gz %changelog +* Mon Aug 15 2022 Justin M. Forbes - 6.0.0-0.rc1.git0.1 +- Linux v6.0-rc1 + * Mon Aug 01 2022 Justin M. Forbes - 5.19.0-1 - Linux v5.19.0 diff --git a/sources b/sources index ba63603..874c03a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (linux-5.19.tar.xz) = 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623 +SHA512 (patch-6.0-rc1.xz) = 11b0fe31d03720f7061273e4986e08e8e1b695415b0cabd7296368e0457a33cccbe291601d9acc4fd1a19b38c737927072af2f06bb2b86d99050f6f9de30de1a