diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
| commit | f7ba01a9677fffa21535bc6cdcad930a858d6106 (patch) | |
| tree | 6eb6df39221f8926b813d63b41ffed9da18e6a5d /kernel.spec | |
| parent | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (diff) | |
| parent | 6c2cc50051831fa502a8b082a312ca90e7039f3f (diff) | |
| download | kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.gz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.xz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.zip | |
merge masterkernel-5.7.0-0.rc3.1.vanilla.1.fc33kernel-5.7.0-0.rc3.1.vanilla.1.fc32kernel-5.7.0-0.rc3.1.vanilla.1.fc31kernel-5.7.0-0.rc3.1.vanilla.1.fc30
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 1ab820530..21769cb1c 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.rc2.20200423git7adc4b399952.1 +%global distro_build 0.rc3.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,10 +71,10 @@ Summary: The Linux kernel %endif %define rpmversion 5.7.0 -%define pkgrelease 0.rc2.20200423git7adc4b399952.1 +%define pkgrelease 0.rc3.1.test # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20200423git7adc4b399952.1%{?buildid}%{?dist} +%define specrelease 0.rc3.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -570,7 +570,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200423git7adc4b399952.tar.xz +Source0: linux-5.7-rc3.tar.xz # Name of the packaged file containing signing key @@ -783,7 +783,6 @@ Patch72: 0001-drm-panel-add-Xingbangda-XBD599-panel.patch Patch73: 0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch Patch74: 0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch Patch75: 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch -Patch76: 0001-tty-sysrq-Export-sysrq_mask.patch %endif @@ -1279,8 +1278,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200423git7adc4b399952 -c -mv linux-20200423git7adc4b399952 linux-%{KVERREL} +%setup -q -n kernel-5.7-rc3 -c +mv linux-5.7-rc3 linux-%{KVERREL} cd linux-%{KVERREL} @@ -1363,7 +1362,6 @@ ApplyOptionalPatch 0001-drm-panel-add-Xingbangda-XBD599-panel.patch ApplyOptionalPatch 0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch ApplyOptionalPatch 0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch ApplyOptionalPatch 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch -ApplyOptionalPatch 0001-tty-sysrq-Export-sysrq_mask.patch %endif @@ -2771,6 +2769,16 @@ fi # # %changelog +* Sun Apr 26 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc3.1] +- v5.7-rc3 rebase +- Add cec to the filter overrides ("Justin M. Forbes") +- Add overrides to filter-modules.sh ("Justin M. Forbes") +- Adjust the changelog update script to not push anything (Jeremy Cline) +- Drop --target noarch from the rh-rpms make target (Jeremy Cline) + +* Fri Apr 24 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc2.20200424gitb4f633221f0a.1] +- b4f633221f0a rebase + * Thu Apr 23 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc2.20200423git7adc4b399952.1] - 7adc4b399952 rebase - Match template format in kernel.spec.template ("Justin M. Forbes") |