diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-16 09:14:25 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-16 09:14:25 +0100 |
commit | fea21ec9cdc01b3e6a8991c8253a2c484f34c6df (patch) | |
tree | ebcf5762ec88db709c4f901b160c10c0351e1014 /kernel.spec | |
parent | 84896e92764967eae4fbb329e22a1868ad14eb16 (diff) | |
parent | d24ad453a6273ee9dec91d3d7caf072b8a2817e3 (diff) | |
download | kernel-fea21ec9cdc01b3e6a8991c8253a2c484f34c6df.tar.gz kernel-fea21ec9cdc01b3e6a8991c8253a2c484f34c6df.tar.xz kernel-fea21ec9cdc01b3e6a8991c8253a2c484f34c6df.zip |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 2f671d5d2..a108f6522 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc7.20210210gite0756cfc7d7c.150 +%global distro_build 155 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -107,13 +107,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc7.20210210gite0756cfc7d7c.150 +%define pkgrelease 155 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20210210gite0756cfc7d7c.150%{?buildid}%{?dist} +%define specrelease 155%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -203,7 +203,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # The kernel tarball/base version %define kversion 5.11 @@ -604,7 +604,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210210gite0756cfc7d7c.tar.xz +Source0: linux-5.11.tar.xz Source1: Makefile.rhelver @@ -1253,8 +1253,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210210gite0756cfc7d7c -c -mv linux-20210210gite0756cfc7d7c linux-%{KVERREL} +%setup -q -n kernel-5.11 -c +mv linux-5.11 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2756,9 +2756,18 @@ fi # # %changelog -* Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.150] +* Mon Feb 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-155] - Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera) +* Mon Feb 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-154] +- process_configs.sh: fix find/xargs data flow (Ondrej Mosnacek) + +* Sat Feb 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210213gitdcc0b49040c7.151] +- Fedora config update (Justin M. Forbes) + +* Fri Feb 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210212git291009f656e8.150] +- fedora: minor arm sound config updates (Peter Robinson) + * Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.149] - Fix trailing white space in redhat/configs/fedora/generic/CONFIG_SND_INTEL_BYT_PREFER_SOF (Justin M. Forbes) - Add a redhat/rebase-notes.txt file (Hans de Goede) |