diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-02 06:46:46 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-02 06:46:46 +0200 |
commit | 7cc811ae12d3067d4a694a6f07ee3929db1c7a77 (patch) | |
tree | 2858212e011212dc35585322ef1008ee00026128 /kernel.spec | |
parent | 89964532af24450f52b6d01dacd294217911419e (diff) | |
parent | 50137282fa79d92b77e94e4e6573b07c5ca50adc (diff) | |
download | kernel-7cc811ae12d3067d4a694a6f07ee3929db1c7a77.tar.gz kernel-7cc811ae12d3067d4a694a6f07ee3929db1c7a77.tar.xz kernel-7cc811ae12d3067d4a694a6f07ee3929db1c7a77.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc3.20200901gitb51594df17d0.1.vanilla.2.fc32
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 245abecf0..835a2aa5a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc3.1 +%global distro_build 0.rc3.20200901gitb51594df17d0.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,13 +71,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.9.0 -%define pkgrelease 0.rc3.1 +%define pkgrelease 0.rc3.20200901gitb51594df17d0.1 # This is needed to do merge window version magic %define patchlevel 9 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.1%{?buildid}%{?dist} +%define specrelease 0.rc3.20200901gitb51594df17d0.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -168,7 +168,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.9 @@ -183,11 +183,11 @@ Summary: The Linux kernel %define with_ipaclones 0 # no whitelist %define with_kernel_abi_whitelists 0 +%endif # Fedora builds these separately %define with_perf 0 %define with_tools 0 %define with_bpftool 0 -%endif %if %{with_verbose} %define make_opts V=1 @@ -569,7 +569,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.9-rc3.tar.xz +Source0: linux-20200901gitb51594df17d0.tar.xz Source1: Makefile.rhelver @@ -791,6 +791,7 @@ Patch71: 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch Patch72: 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch Patch73: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch Patch74: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch +Patch75: media-ti-vpe-cal-Fix-compilation-on-32-bit-ARM.patch %endif @@ -1286,8 +1287,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.9-rc3 -c -mv linux-5.9-rc3 linux-%{KVERREL} +%setup -q -n kernel-20200901gitb51594df17d0 -c +mv linux-20200901gitb51594df17d0 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -1367,6 +1368,7 @@ ApplyOptionalPatch 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch ApplyOptionalPatch 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch +ApplyOptionalPatch media-ti-vpe-cal-Fix-compilation-on-32-bit-ARM.patch %endif @@ -2785,6 +2787,12 @@ fi # # %changelog +* Tue Sep 01 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200901gitb51594df17d0.1] +- b51594df17d0 rebase +- Fedora filter update ("Justin M. Forbes") +- Config update for Fedora ("Justin M. Forbes") +- Updated changelog for the release based on v5.9-rc3 (Fedora Kernel Team) + * Mon Aug 31 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.1] - v5.9-rc3 rebase - Updated changelog for the release based on 1127b219ce94 (Fedora Kernel Team) |