diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-05 16:41:11 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-05 16:41:11 +0200 |
commit | def8cf129efcd41942f6684e26e737bbfca5d62e (patch) | |
tree | b51ef92aaca6e7f48037d71d69b38fc896ebd344 /kernel.spec | |
parent | 478ad513ed09190433b1c01bb4a7f6cb64b3b149 (diff) | |
parent | 5f7d08ee5f8b230f5dfb20783ec265ef40387520 (diff) | |
download | kernel-def8cf129efcd41942f6684e26e737bbfca5d62e.tar.gz kernel-def8cf129efcd41942f6684e26e737bbfca5d62e.tar.xz kernel-def8cf129efcd41942f6684e26e737bbfca5d62e.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc8.28.vanilla.1.fc34kernel-5.9.0-0.rc8.28.vanilla.1.fc33kernel-5.9.0-0.rc8.28.vanilla.1.fc32kernel-5.9.0-0.rc8.28.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 63 |
1 files changed, 53 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index 7b521bde8..991a41f18 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.rc7.20200930gitfb0155a09b02.22 +%global distro_build 0.rc8.28 %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.rc7.20200930gitfb0155a09b02.22 +%define pkgrelease 0.rc8.28 # This is needed to do merge window version magic %define patchlevel 9 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20200930gitfb0155a09b02.22%{?buildid}%{?dist} +%define specrelease 0.rc8.28%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -184,10 +184,10 @@ Summary: The Linux kernel # no whitelist %define with_kernel_abi_whitelists 0 # Fedora builds these separately +%endif %define with_perf 0 %define with_tools 0 %define with_bpftool 0 -%endif %if %{with_verbose} %define make_opts V=1 @@ -568,7 +568,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200930gitfb0155a09b02.tar.xz +Source0: linux-5.9-rc8.tar.xz Source1: Makefile.rhelver @@ -792,7 +792,6 @@ 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: 0001-Filter-out-LTO-build-options-from-the-perl-ccopts.patch -Patch76: 0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch %endif @@ -1288,8 +1287,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200930gitfb0155a09b02 -c -mv linux-20200930gitfb0155a09b02 linux-%{KVERREL} +%setup -q -n kernel-5.9-rc8 -c +mv linux-5.9-rc8 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -1370,7 +1369,6 @@ ApplyOptionalPatch 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.pat ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch ApplyOptionalPatch 0001-Filter-out-LTO-build-options-from-the-perl-ccopts.patch -ApplyOptionalPatch 0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch %endif @@ -2075,7 +2073,6 @@ BuildKernel %make_target %kernel_image %{_use_vdso} %global perf_make \ %{__make} -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} -%global _lto_cflags %{nil} # perf # make sure check-headers.sh is executable chmod +x tools/perf/check-headers.sh @@ -2790,6 +2787,52 @@ fi # # %changelog +* Mon Oct 05 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc8.27] +- Merge ark-patches + +* Mon Oct 05 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc8.26.test] +- v5.9-rc8 rebase +- Updated changelog for the release based on 22fbc037cd32 (Fedora Kernel Team) + +* Mon Oct 05 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201005git22fbc037cd32.26] +- Merge ark-patches + +* Mon Oct 05 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201005git22fbc037cd32.25.test] +- 22fbc037cd32 rebase +- Updated changelog for the release based on d3d45f8220d6 (Fedora Kernel Team) + +* Sun Oct 04 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201004gitd3d45f8220d6.25] +- Merge ark-patches + +* Sun Oct 04 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201004gitd3d45f8220d6.24.test] +- d3d45f8220d6 rebase +- Updated changelog for the release based on 472e5b056f00 (Fedora Kernel Team) + +* Sat Oct 03 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201003git472e5b056f00.24] +- Merge ark-patches + +* Sat Oct 03 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201003git472e5b056f00.23.test] +- 472e5b056f00 rebase +- Set SquashFS decompression options for all flavors to match RHEL (Bohdan Khomutskyi) +- Updated changelog for the release based on 60e720931556 (Fedora Kernel Team) + +* Fri Oct 02 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201002git60e720931556.23] +- Merge ark-patches + +* Fri Oct 02 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201002git60e720931556.22.test] +- 60e720931556 rebase +- New configs in drivers/pinctrl (Fedora Kernel Team) +- Updated changelog for the release based on 02de58b24d2e (Fedora Kernel Team) +- Update CONFIG_THERMAL_NETLINK (Justin Forbes) +- configs: Enable CONFIG_ENERGY_MODEL (Phil Auld) + +* Thu Oct 01 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201001git02de58b24d2e.22] +- Merge ark-patches + +* Thu Oct 01 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201001git02de58b24d2e.21.test] +- 02de58b24d2e rebase +- Updated changelog for the release based on fb0155a09b02 (Fedora Kernel Team) + * Wed Sep 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20200930gitfb0155a09b02.21] - Merge ark-patches |