diff options
| -rw-r--r-- | Makefile.rhelver | 2 | ||||
| -rw-r--r-- | Patchlist.changelog | 8 | ||||
| -rw-r--r-- | kernel.spec | 21 | ||||
| -rw-r--r-- | sources | 6 |
4 files changed, 19 insertions, 18 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 3797e14a3..5df8e74ba 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 48 +RHEL_RELEASE = 49 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 9bb2144b0..5536fb6e6 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/4e70b1fc228911b703d7c38c9f1ab997439d499f - 4e70b1fc228911b703d7c38c9f1ab997439d499f Filter out LTO build options from the perl ccopts +https://gitlab.com/cki-project/kernel-ark/-/commit/fb4aa3e4b5176b9d9a8330ea3400bf1b6c8e2ce0 + fb4aa3e4b5176b9d9a8330ea3400bf1b6c8e2ce0 Filter out LTO build options from the perl ccopts -https://gitlab.com/cki-project/kernel-ark/-/commit/09cd8005b4b8fcdd3507674b419d0b124fe85095 - 09cd8005b4b8fcdd3507674b419d0b124fe85095 Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 +https://gitlab.com/cki-project/kernel-ark/-/commit/1bb61f178e1807695979b79442ce06388485bf57 + 1bb61f178e1807695979b79442ce06388485bf57 Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 https://gitlab.com/cki-project/kernel-ark/-/commit/17b0f7f1d49df30661b517d668715ff5ee1bab09 17b0f7f1d49df30661b517d668715ff5ee1bab09 Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only diff --git a/kernel.spec b/kernel.spec index 4556eff9f..52e3abaf9 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.rc0.20201019git071a0578b0ce.48 +%global distro_build 0.rc0.20201021git071a0578b0ce.49 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -69,13 +69,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.10.0 -%define pkgrelease 0.rc0.20201019git071a0578b0ce.48 +%define pkgrelease 0.rc0.20201021git071a0578b0ce.49 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20201019git071a0578b0ce.48%{?buildid}%{?dist} +%define specrelease 0.rc0.20201021git071a0578b0ce.49%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -566,7 +566,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20201019git071a0578b0ce.tar.xz +Source0: linux-20201021git071a0578b0ce.tar.xz Source1: Makefile.rhelver @@ -1210,8 +1210,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20201019git071a0578b0ce -c -mv linux-20201019git071a0578b0ce linux-%{KVERREL} +%setup -q -n kernel-20201021git071a0578b0ce -c +mv linux-20201021git071a0578b0ce linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2647,13 +2647,14 @@ fi # # %changelog -* Mon Oct 19 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.10.0-0.rc0.20201019git071a0578b0ce.48] -- Fedora config updates ("Justin M. Forbes") - -* Mon Oct 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201019git071a0578b0ce.47] +* Tue Oct 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201020git071a0578b0ce.48] - Filter out LTO build options from the perl ccopts ("Justin M. Forbes") - Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 ("Justin M. Forbes") +* Tue Oct 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201020git071a0578b0ce.47.test] +- Fix Fedora config locations ("Justin M. Forbes") +- Fedora config updates ("Justin M. Forbes") + * Sat Oct 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201017git071a0578b0ce.44.test] - 071a0578b0ce rebase - configs: enable CONFIG_CRYPTO_CTS=y so cts(cbc(aes)) is available in FIPS mode (Vladis Dronov) @@ -1,3 +1,3 @@ -SHA512 (linux-20201019git071a0578b0ce.tar.xz) = 284f344b734bfd53402f77c53fbc2c51bc324ac1209a57e3c54815e557ecdc645ceb24a5b6a3a8c82272b07eba87c0e61f4437d9e298c5d10b5a989c88ea7356 -SHA512 (kernel-abi-whitelists-5.10.0-0.rc0.20201019git071a0578b0ce.48.tar.bz2) = 80bc0823677c221603d1d2c9f4c8ceb58ce5ffb942eb626cfdfd3d460c74898d7678f782fcd1849a33cb2bc8f0e38537d899f5030d30ff7b463531aaa7d4af5f -SHA512 (kernel-kabi-dw-5.10.0-0.rc0.20201019git071a0578b0ce.48.tar.bz2) = 4d23074646d52c2514ee52f8fda6aab9a986918f60084304d203ef9a59f0f237ab4dd45ddf2becc824c766acd3cb21f0327e79db2c605c010f399ae18e8d5bed +SHA512 (linux-20201021git071a0578b0ce.tar.xz) = 715c49fb01dc5d54767d2c6ae6be099a5467530741e6dac9207e841a4c479a16660a8ca9646a0c42c8ce6baa0ce9abaa9b5dab5edede7b438cb38f267912948b +SHA512 (kernel-abi-whitelists-5.10.0-0.rc0.20201021git071a0578b0ce.49.tar.bz2) = cfb64efcc02c5f6610197d27fa49478cc095baf99aa862a2c8cc3cd4b19fd7eb98fc1cd9cda8c7e0a9bee3c1f7c64f6d08bd2a6f1149bf2d790594bf9ba25a50 +SHA512 (kernel-kabi-dw-5.10.0-0.rc0.20201021git071a0578b0ce.49.tar.bz2) = 90c7511658ee607ce21c2110d6c43505988b6413516b8458cfe6f3026e4ae87b47588e806feb916859d025334a1ee3b9ddb0331152699c195269b9bbc091a535 |