diff options
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 77 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 20 insertions, 61 deletions
@@ -1 +1 @@ -cd8dead0c39457e58ec1d36db93aedca811d48f1 +8113a85f872003a9f5c58f9f143054b0d8ec73a5 diff --git a/kernel.spec b/kernel.spec index b05bd4ae7..a5a105790 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 6 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -94,7 +94,7 @@ Summary: The Linux kernel # # standard kernel %define with_up %{?_without_up: 0} %{?!_without_up: 1} -# kernel PAE (only valid for i686 (PAE) and ARM (lpae)) +# kernel PAE (only valid for ARM (lpae)) %define with_pae %{?_without_pae: 0} %{?!_without_pae: 1} # kernel-debug %define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} @@ -208,9 +208,7 @@ Summary: The Linux kernel # and debuginfo generation. Currently we rely on the old alldebug setting. %global _build_id_links alldebug -# kernel PAE is only built on ARMv7 in rawhide. -# Fedora 27 and earlier still support PAE, so change this on rebases. -# %ifnarch i686 armv7hl +# kernel PAE is only built on ARMv7 %ifnarch armv7hl %define with_pae 0 %endif @@ -258,7 +256,7 @@ Summary: The Linux kernel %endif # sparse blows up on ppc -%ifnarch %{power64} +%ifnarch ppc64le %define with_sparse 0 %endif @@ -267,7 +265,6 @@ Summary: The Linux kernel %ifarch %{all_x86} %define asmarch x86 %define hdrarch i386 -%define pae PAE %define all_arch_configs kernel-%{version}-i?86*.config %define kernel_image arch/x86/boot/bzImage %endif @@ -278,7 +275,7 @@ Summary: The Linux kernel %define kernel_image arch/x86/boot/bzImage %endif -%ifarch %{power64} +%ifarch ppc64le %define asmarch powerpc %define hdrarch powerpc %define make_target vmlinux @@ -301,7 +298,6 @@ Summary: The Linux kernel %define skip_nonpae_vdso 1 %define asmarch arm %define hdrarch arm -%define pae lpae %define make_target bzImage %define kernel_image arch/arm/boot/zImage # http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/091404.html @@ -349,13 +345,8 @@ Summary: The Linux kernel %define _enable_debug_packages 0 %endif -%define with_pae_debug 0 -%if %{with_pae} -%define with_pae_debug %{with_debug} -%endif - # Architectures we build tools/cpupower on -%define cpupowerarchs %{ix86} x86_64 %{power64} %{arm} aarch64 +%define cpupowerarchs %{ix86} x86_64 ppc64le %{arm} aarch64 %if %{use_vdso} @@ -774,7 +765,7 @@ The meta-package for the %{1} kernel\ Summary: %{variant_summary}\ Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\ Provides: installonlypkg(kernel)\ -%ifarch %{power64}\ +%ifarch ppc64le\ Obsoletes: kernel-bootwrapper\ %endif\ %{expand:%%kernel_reqprovconf}\ @@ -790,37 +781,13 @@ Obsoletes: kernel-bootwrapper\ # Now, each variant package. %if %{with_pae} -%ifnarch armv7hl -%define variant_summary The Linux kernel compiled for PAE capable machines -%kernel_variant_package %{pae} -%description %{pae}-core -This package includes a version of the Linux kernel with support for up to -64GB of high memory. It requires a CPU with Physical Address Extensions (PAE). -The non-PAE kernel can only address up to 4GB of memory. -Install the kernel-PAE package if your machine has more than 4GB of memory. -%else %define variant_summary The Linux kernel compiled for Cortex-A15 -%kernel_variant_package %{pae} -%description %{pae}-core +%kernel_variant_package lpae +%description lpae-core This package includes a version of the Linux kernel with support for Cortex-A15 devices with LPAE and HW virtualisation support %endif - -%define variant_summary The Linux kernel compiled with extra debugging enabled for PAE capable machines -%kernel_variant_package %{pae}debug -Obsoletes: kernel-PAE-debug -%description %{pae}debug-core -This package includes a version of the Linux kernel with support for up to -64GB of high memory. It requires a CPU with Physical Address Extensions (PAE). -The non-PAE kernel can only address up to 4GB of memory. -Install the kernel-PAE package if your machine has more than 4GB of memory. - -This variant of the kernel has numerous debugging options enabled. -It should only be installed when trying to gather additional information -on kernel bugs, as some of these options impact performance noticably. -%endif - %define variant_summary The Linux kernel compiled with extra debugging enabled %kernel_variant_package debug %description debug-core @@ -1376,7 +1343,7 @@ BuildKernel() { fi rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o -%ifarch %{power64} +%ifarch ppc64le cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ %endif if [ -d arch/%{asmarch}/include ]; then @@ -1575,12 +1542,8 @@ cd linux-%{KVERREL} BuildKernel %make_target %kernel_image %{_use_vdso} debug %endif -%if %{with_pae_debug} -BuildKernel %make_target %kernel_image %{use_vdso} %{pae}debug -%endif - %if %{with_pae} -BuildKernel %make_target %kernel_image %{use_vdso} %{pae} +BuildKernel %make_target %kernel_image %{use_vdso} lpae %endif %if %{with_up} @@ -1601,14 +1564,11 @@ BuildKernel %make_target %kernel_image %{_use_vdso} %define __modsign_install_post \ if [ "%{signmodules}" -eq "1" ]; then \ if [ "%{with_pae}" -ne "0" ]; then \ - %{modsign_cmd} certs/signing_key.pem.sign+%{pae} certs/signing_key.x509.sign+%{pae} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+%{pae}/ \ + %{modsign_cmd} certs/signing_key.pem.sign+lpae certs/signing_key.x509.sign+lpae $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+lpae/ \ fi \ if [ "%{with_debug}" -ne "0" ]; then \ %{modsign_cmd} certs/signing_key.pem.sign+debug certs/signing_key.x509.sign+debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \ fi \ - if [ "%{with_pae_debug}" -ne "0" ]; then \ - %{modsign_cmd} certs/signing_key.pem.sign+%{pae}debug certs/signing_key.x509.sign+%{pae}debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+%{pae}debug/ \ - fi \ if [ "%{with_up}" -ne "0" ]; then \ %{modsign_cmd} certs/signing_key.pem.sign certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \ fi \ @@ -1787,11 +1747,8 @@ fi}\ %kernel_variant_post -r kernel-smp %if %{with_pae} -%kernel_variant_preun %{pae} -%kernel_variant_post -v %{pae} -r (kernel|kernel-smp) - -%kernel_variant_post -v %{pae}debug -r (kernel|kernel-smp) -%kernel_variant_preun %{pae}debug +%kernel_variant_preun lpae +%kernel_variant_post -v lpae -r (kernel|kernel-smp) %endif %kernel_variant_preun debug @@ -1875,14 +1832,16 @@ fi %kernel_variant_files %{_use_vdso} %{with_up} %kernel_variant_files %{_use_vdso} %{with_debug} debug -%kernel_variant_files %{use_vdso} %{with_pae} %{pae} -%kernel_variant_files %{use_vdso} %{with_pae_debug} %{pae}debug +%kernel_variant_files %{use_vdso} %{with_pae} lpae # plz don't put in a version string unless you're going to tag # and build. # # %changelog +* Fri Apr 26 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc6.git4.1 +- Linux v5.1-rc6-72-g8113a85f8720 + * Thu Apr 25 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc6.git3.1 - Linux v5.1-rc6-64-gcd8dead0c394 @@ -1,3 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc6.xz) = 5494f2ce8f9b7090b7824501e5bef051cc7fd1d90864ca054e834ea162aefbe9e0d9fa4419d49c004cdba3fc1b1b8033a902c100e2f11414b56ac541c50ed29e -SHA512 (patch-5.1-rc6-git3.xz) = 03ba2006fc951f7dd9e7053957ec1e6a07740d2b29b96eadefa42d17b9e3f803765bfbb4110af44c289e7595a0b1f4e120fab328b05b18e1ffad81966a1ee63a +SHA512 (patch-5.1-rc6-git4.xz) = 40a1f66065179f7b8bc721994bdc35a76c896a11031e234c4c56952bc0381a32d8a87195ac52d017caeb6e0150c93410ab8f828a0fd0ea96eb81585376388d7d |