diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-12 20:50:22 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-12 20:50:22 +0100 |
| commit | c4211c9c342d0421d83765ca57fc36e030be4b5f (patch) | |
| tree | 817aa50779315944427a05027a5a5ab7d47107ec /kernel.spec | |
| parent | a223d454774cc181f1229969af0895d9242ffb50 (diff) | |
| parent | f1879fd534d196a61d446b0d3f70bd3e804390df (diff) | |
| download | kernel-c4211c9c342d0421d83765ca57fc36e030be4b5f.tar.gz kernel-c4211c9c342d0421d83765ca57fc36e030be4b5f.tar.xz kernel-c4211c9c342d0421d83765ca57fc36e030be4b5f.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc3.20201112git3d5e28bff7ad.73.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 86c909664..6eb9f1158 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc3.68 +%global distro_build 0.rc3.20201112git3d5e28bff7ad.73 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -97,13 +97,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.10.0 -%define pkgrelease 0.rc3.68 +%define pkgrelease 0.rc3.20201112git3d5e28bff7ad.73 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.68%{?buildid}%{?dist} +%define specrelease 0.rc3.20201112git3d5e28bff7ad.73%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -193,7 +193,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 1 +%define debugbuildsenabled 0 # The kernel tarball/base version %define kversion 5.10 @@ -594,7 +594,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.10-rc3.tar.xz +Source0: linux-20201112git3d5e28bff7ad.tar.xz Source1: Makefile.rhelver @@ -1238,8 +1238,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.10-rc3 -c -mv linux-5.10-rc3 linux-%{KVERREL} +%setup -q -n kernel-20201112git3d5e28bff7ad -c +mv linux-20201112git3d5e28bff7ad linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2681,7 +2681,15 @@ fi # # %changelog -* Mon Nov 09 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.10.0-0.rc3.68] +* Thu Nov 12 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc3.20201112git3d5e28bff7ad.71.test] +- 3d5e28bff7ad rebase + +* Wed Nov 11 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc3.20201111giteccc87672492.68.test] +- eccc87672492 rebase +- redhat: enable CONFIG_INTEL_IOMMU_SVM (Jerry Snitselaar) + +* Tue Nov 10 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc3.67.test] +- More Fedora config fixes ("Justin M. Forbes") - Fedora 5.10 config updates ("Justin M. Forbes") * Mon Nov 09 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc3.66.test] |