From e3bcc72732a2b0b9b28bcdf3e4510009318e2028 Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Thu, 14 Jan 2021 15:38:19 -0500 Subject: [PATCH] kernel-5.11.0-0.rc3.125.el9 * Thu Jan 14 2021 Herton R. Krzesinski [5.11.0-0.rc3.125] - v5.11-rc3-68-g65f0d2414b70 rebase - build system: run parallel make for bpf and kselftests install (Denys Vlasenko) - Use cross_arm to compile kernel-ark on copr for armhfp (Nicolas Chauvet) Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel.spec | 34 +++++++++++++++++++++++++--------- sources | 6 +++--- 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 232a8bb..6a1f650 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 = 124 +RHEL_RELEASE = 125 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index dfee4e8..08e708f 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/bf07a85cd0f7fd4acb55ee99fde07ddfa4a81848 - bf07a85cd0f7fd4acb55ee99fde07ddfa4a81848 irq: export irq_check_status_bit +https://gitlab.com/cki-project/kernel-ark/-/commit/ac66897491812e72306020ec0bbf718f5d0b56f7 + ac66897491812e72306020ec0bbf718f5d0b56f7 irq: export irq_check_status_bit https://gitlab.com/cki-project/kernel-ark/-/commit/e187313e5f0086538fefe0925ef84480f99616d8 e187313e5f0086538fefe0925ef84480f99616d8 gcc-plugins: fix gcc 11 indigestion with plugins... diff --git a/kernel.spec b/kernel.spec index a11b041..53c962e 100755 --- a/kernel.spec +++ b/kernel.spec @@ -7,6 +7,14 @@ %global _lto_cflags %{nil} +# Cross compile on copr for arm +# See https://bugzilla.redhat.com/1879599 +%if 0%{?_with_cross_arm:1} +%global _target_cpu armv7hl +%global _arch arm +%global _build_arch arm +%global _with_cross 1 +%endif # The kernel's %%install section is special # Normally the %%install section starts by cleaning up the BUILD_ROOT @@ -56,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc3.124 +%global distro_build 0.rc3.125 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -97,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc3.124 +%define pkgrelease 0.rc3.125 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.124%{?buildid}%{?dist} +%define specrelease 0.rc3.125%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -576,6 +584,7 @@ BuildRequires: pesign >= 0.10-4 %if %{with_cross} BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu %define cross_opts CROSS_COMPILE=%{_build_arch}-linux-gnu- +%define __strip %{_build_arch}-linux-gnu-strip %endif # These below are required to build man pages @@ -592,7 +601,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.11.0-0.rc3.124.tar.xz +Source0: linux-5.11.0-0.rc3.125.tar.xz Source1: Makefile.rhelver @@ -1236,8 +1245,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.0-0.rc3.124 -c -mv linux-5.11.0-0.rc3.124 linux-%{KVERREL} +%setup -q -n kernel-5.11.0-0.rc3.125 -c +mv linux-5.11.0-0.rc3.125 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2725,13 +2734,20 @@ fi # # %changelog -* Wed Jan 13 2021 Herton R. Krzesinski [5.11.0-0.rc3.124] -- v5.11-rc3-32-ge609571b5ffa rebase +* Thu Jan 14 2021 Herton R. Krzesinski [5.11.0-0.rc3.125] +- v5.11-rc3-68-g65f0d2414b70 rebase +- build system: run parallel make for bpf and kselftests install (Denys Vlasenko) +- Use cross_arm to compile kernel-ark on copr for armhfp (Nicolas Chauvet) -* Wed Jan 13 2021 Fedora Kernel Team [5.11.0-0.rc3.20210113gite609571b5ffa.124] +* Thu Jan 14 2021 Fedora Kernel Team [5.11.0-0.rc3.20210114git65f0d2414b70.125] - irq: export irq_check_status_bit (Levi Yun) - Turn off vdso_install for ppc ("Justin M. Forbes") +* Thu Jan 14 2021 Fedora Kernel Team [5.11.0-0.rc3.20210114git65f0d2414b70.124] +- Reword comment (Nicolas Chauvet) +- Add with_cross_arm conditional (Nicolas Chauvet) +- Redefines __strip if with_cross (Nicolas Chauvet) + * Wed Jan 13 2021 Fedora Kernel Team [5.11.0-0.rc3.20210113gite609571b5ffa.123] - fedora: only enable ACPI_CONFIGFS, ACPI_CUSTOM_METHOD in debug kernels (Peter Robinson) - fedora: User the same EFI_CUSTOM_SSDT_OVERLAYS as ARK (Peter Robinson) diff --git a/sources b/sources index f0a8916..978b8f1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.0-0.rc3.124.tar.xz) = b3eaeb2ef7929543dbf14fd4c9b7a9e0832794479ee7d35861b5a086b780df8ddb43f2e78650c2e3bd80a8dd1430977c2359c4bc6bbda2610aab943a814c17e8 -SHA512 (kernel-abi-whitelists-5.11.0-0.rc3.124.tar.bz2) = 6dc237d20036b82c72d5b17a838625ed9c57d5fcc756233228f3a0a7ed4ba0bbc1a3a509d6711367780a78fa1a3c240b400e7a02f22356de565acb5a82027823 -SHA512 (kernel-kabi-dw-5.11.0-0.rc3.124.tar.bz2) = 6da162902305420cc801dcad61bf31960ff18f008e913b2a60d3e2185887c41c494c657f1dabeda53f25027728bf8aa751b37a749c89319adb68f30e3bcfe752 +SHA512 (linux-5.11.0-0.rc3.125.tar.xz) = 1447eb81af40e09b3fb434a54cbe5f2bfd47fe0059b8d3629d909e39b8c7f4a69f8cf4726fe1953a444f6927318b9a9a0466f19800b88ef14aad4fb9982b9b75 +SHA512 (kernel-abi-whitelists-5.11.0-0.rc3.125.tar.bz2) = 99f3edfbe86632a19cd8ae1bcf085734158e71133324e14be2bbab5acd00b1d6292eeb1c7ae9388a5e5f1fb7ec84058aceb74c58e24a1bab76840f7b6738b791 +SHA512 (kernel-kabi-dw-5.11.0-0.rc3.125.tar.bz2) = ce0ff40db514aee886a7d11158f444ab410d7c486ca88a0ba979b85a14604efc3ab418364bc07a080a420369c85e7fa9128c6c0fd78c3ce27f11e9a3dfef9d2f