diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-14 21:05:46 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-14 21:05:46 +0200 |
| commit | 4b3848972b6fbc0e0325d77e7b14174c52fd5a00 (patch) | |
| tree | 69344e95fce778ed61123da0bab49ae7d56353d5 /kernel.spec | |
| parent | 92b20db5d70b522842cb6d47e3eba89552a05c12 (diff) | |
| parent | ec39482fad6babae562a01b46fa2f878f1e0c935 (diff) | |
| download | kernel-4b3848972b6fbc0e0325d77e7b14174c52fd5a00.tar.gz kernel-4b3848972b6fbc0e0325d77e7b14174c52fd5a00.tar.xz kernel-4b3848972b6fbc0e0325d77e7b14174c52fd5a00.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc38kernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc37kernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc36kernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc35
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index d120c9c36..1398f420d 100755 --- a/kernel.spec +++ b/kernel.spec @@ -128,13 +128,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.1.0 %define patchversion 6.1 -%define pkgrelease 0.rc0.20221013gita185a0995518.11 +%define pkgrelease 0.rc0.20221014git9c9155a3509a.11 %define kversion 6 -%define tarfile_release 6.0-11658-ga185a0995518 +%define tarfile_release 6.0-11990-g9c9155a3509a # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20221013gita185a0995518.11%{?buildid}%{?dist} +%define specrelease 0.rc0.20221014git9c9155a3509a.11%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.1.0 @@ -2891,7 +2891,7 @@ if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ] &&\ /bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\ fi}\ mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\ -touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}\ +touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?-v:+%{-v*}}\ %{nil} # @@ -3194,8 +3194,14 @@ fi # # %changelog -* Thu Oct 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.a185a0995518.11] +* Fri Oct 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.9c9155a3509a.11] - Add kasan_test to mod-internal.list (Justin M. Forbes) +- redhat/Makefile.variables: Fix typo with RHDISTGIT_TMP (Prarit Bhargava) +- spec: fix path to `installing_core` stamp file for subpackages (Jonathan Lebon) +- Remove unused ci scripts (Don Zickus) +- Rename rename FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER in configs (Justin M. Forbes) +- redhat: Add new fortify_kunit & is_signed_type_kunit to mod-internal.list (Patrick Talbert) +- Linux v6.1.0-0.rc0.9c9155a3509a * Thu Oct 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.a185a0995518.10] - Linux v6.1.0-0.rc0.a185a0995518 |