diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-19 19:59:38 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-19 19:59:38 +0200 |
| commit | ffb025d9feab02fc445441ac7204285c040bbb38 (patch) | |
| tree | abe3841a5d202f20a78be0040e9c8506946aa85e /kernel.spec | |
| parent | b45304753a5be5a1b9a0e80ffb66e415bc081bd0 (diff) | |
| parent | 036a7ad18b69f386bfc85efe53d41e0478fbc897 (diff) | |
| download | kernel-ffb025d9feab02fc445441ac7204285c040bbb38.tar.gz kernel-ffb025d9feab02fc445441ac7204285c040bbb38.tar.xz kernel-ffb025d9feab02fc445441ac7204285c040bbb38.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-0.rc1.20221019gitaae703b02f92.17.vanilla.1.fc38kernel-6.1.0-0.rc1.20221019gitaae703b02f92.17.vanilla.1.fc37kernel-6.1.0-0.rc1.20221019gitaae703b02f92.17.vanilla.1.fc36kernel-6.1.0-0.rc1.20221019gitaae703b02f92.17.vanilla.1.fc35
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 55a2e418b..c28221689 100755 --- a/kernel.spec +++ b/kernel.spec @@ -90,7 +90,6 @@ Summary: The Linux kernel %if %{zipmodules} %global zipsed -e 's/\.ko$/\.ko.xz/' -# for parallel xz processes, replace with 1 to go back to single process %endif # define buildid .local @@ -128,13 +127,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.1.0 %define patchversion 6.1 -%define pkgrelease 0.rc1.20221018gitbb1a1146467a.16 +%define pkgrelease 0.rc1.20221019gitaae703b02f92.17 %define kversion 6 -%define tarfile_release 6.1-rc1-10-gbb1a1146467a +%define tarfile_release 6.1-rc1-25-gaae703b02f92 # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20221018gitbb1a1146467a.16%{?buildid}%{?dist} +%define specrelease 0.rc1.20221019gitaae703b02f92.17%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.1.0 @@ -764,7 +763,6 @@ Source13: redhatsecureboot003.cer Source20: mod-denylist.sh Source21: mod-sign.sh -Source22: parallel_xz.sh %define modsign_cmd %{SOURCE21} @@ -1530,6 +1528,13 @@ done %endif %endif +# Adjust FIPS module name for RHEL +%if 0%{?rhel} +for i in *.config; do + sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux %{rhel} - Kernel Cryptographic API"/' $i +done +%endif + cp %{SOURCE81} . OPTS="" %if %{with_configchecks} @@ -3194,9 +3199,14 @@ fi # # %changelog -* Tue Oct 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.bb1a1146467a.16] +* Wed Oct 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.aae703b02f92.17] - perf tools: Fix man page build wrt perf-arm-coresight.txt (Adrian Hunter) + +* Wed Oct 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.aae703b02f92.16] +- Adjust FIPS module name in RHEL (Vladis Dronov) - spec: prevent git apply from searching for the .git directory (Ondrej Mosnacek) +- redhat: Remove parallel_xz.sh (Prarit Bhargava) +- Linux v6.1.0-0.rc1.aae703b02f92 * Tue Oct 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.bb1a1146467a.15] - Linux v6.1.0-0.rc1.bb1a1146467a |