diff --git a/Makefile.rhelver b/Makefile.rhelver index 4ef64a680..9e42da42f 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 20 +RHEL_RELEASE = 22 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index aaa31a8b6..81e770a1a 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,10 +1,19 @@ -* Tue Jan 30 2024 Fedora Kernel Team [6.8.0-0.rc2.861c0981648f.20] +* Thu Feb 01 2024 Fedora Kernel Team [6.8.0-0.rc2.6764c317b6bb.22] +- Remove defines forcing tools on, they override cmdline (Justin M. Forbes) - Remove separate license tag for libperf (Justin M. Forbes) - Don't use upstream bpftool version for Fedora package (Justin M. Forbes) - Don't ship libperf.a in libperf-devel (Justin M. Forbes) - add libperf packages and enable perf, libperf, tools and bpftool packages (Thorsten Leemhuis) Resolves: +* Thu Feb 01 2024 Fedora Kernel Team [6.8.0-0.rc2.6764c317b6bb.21] +- Linux v6.8.0-0.rc2.6764c317b6bb +Resolves: + +* Wed Jan 31 2024 Fedora Kernel Team [6.8.0-0.rc2.1bbb19b6eb1b.20] +- Linux v6.8.0-0.rc2.1bbb19b6eb1b +Resolves: + * Tue Jan 30 2024 Fedora Kernel Team [6.8.0-0.rc2.861c0981648f.19] - Linux v6.8.0-0.rc2.861c0981648f Resolves: diff --git a/kernel.spec b/kernel.spec index 8fb8d7810..386c7bef4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.8.0 %define specversion 6.8.0 %define patchversion 6.8 -%define pkgrelease 0.rc2.20240130git861c0981648f.20 +%define pkgrelease 0.rc2.20240201git6764c317b6bb.22 %define kversion 6 -%define tarfile_release 6.8-rc2-31-g861c0981648f +%define tarfile_release 6.8-rc2-55-g6764c317b6bb # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20240130git861c0981648f.20%{?buildid}%{?dist} +%define specrelease 0.rc2.20240201git6764c317b6bb.22%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.8.0 @@ -301,11 +301,6 @@ Summary: The Linux kernel %define with_ipaclones 0 # no stablelist %define with_kernel_abi_stablelists 0 -# Fedora builds these separately -%define with_perf 1 -%define with_libperf 1 -%define with_tools 1 -%define with_bpftool 1 # No realtime fedora variants %define with_realtime 0 %define with_arm64_64k 0 @@ -3843,12 +3838,19 @@ fi\ # # %changelog -* Tue Jan 30 2024 Fedora Kernel Team [6.8.0-0.rc2.861c0981648f.20] +* Thu Feb 01 2024 Fedora Kernel Team [6.8.0-0.rc2.6764c317b6bb.22] +- Remove defines forcing tools on, they override cmdline (Justin M. Forbes) - Remove separate license tag for libperf (Justin M. Forbes) - Don't use upstream bpftool version for Fedora package (Justin M. Forbes) - Don't ship libperf.a in libperf-devel (Justin M. Forbes) - add libperf packages and enable perf, libperf, tools and bpftool packages (Thorsten Leemhuis) +* Thu Feb 01 2024 Fedora Kernel Team [6.8.0-0.rc2.6764c317b6bb.21] +- Linux v6.8.0-0.rc2.6764c317b6bb + +* Wed Jan 31 2024 Fedora Kernel Team [6.8.0-0.rc2.1bbb19b6eb1b.20] +- Linux v6.8.0-0.rc2.1bbb19b6eb1b + * Tue Jan 30 2024 Fedora Kernel Team [6.8.0-0.rc2.861c0981648f.19] - Linux v6.8.0-0.rc2.861c0981648f diff --git a/sources b/sources index 1f0ba5bfa..b0f722aaf 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.8-rc2-31-g861c0981648f.tar.xz) = 20202f774064aefe91ef2ab9cb040b522fbb053e08ba51f40a769c48d01aa877fd41a6ebad95248d27e7c8d876882baad5b6726a01fec22b90eb1e507eb07809 -SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = 71f43cb0bc3cb302120db9008231647f0d2e2e0223747d78694734e7ed3cc2feb7ee04399f39c3407fbc8f93452c1ba5ec4ea52c17e74a82de64e947c4ddacc2 -SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = 3c86daa6f057e40d1c7145caf3592c29f5606dc2c5496b507cc4a78daf1064ae48d6fc09a84521870d51784c686871b11d9928df8d5671429d99c79bf7edea85 +SHA512 (linux-6.8-rc2-55-g6764c317b6bb.tar.xz) = a2b22c51f8c491eb2b936a8936b367707d6483752d82a6c40ed8c0638be268d51cde428b91f7aff73bf17c040f4719fd09bbbe78f68f816fb92efcda9bdd1921 +SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = a55f3860774d0ec2aae74f8b2c8c6b0620fe412723b50e068885c579b948371fdfb7de3065b2cf93d201dd4b1cad2491da69d86c691f7bbc8bc9a6b32c0ff93c +SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = 872cbc401afeaa4721db1c45b7dee707f682d567f80b3f85686589063efb728515e21e6d5b3e68c8850147fb76bab557fe7d076521188a1146234aad8d4bd79d