- up to 5.6.1

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index e6528989f55da3586cd0879118a56f26afe808a2..c014ad99a1cff7c5e7ad0c51f1ea74e5a2755b16 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -22,7 +22,7 @@
 %bcond_with    verbose         # verbose build (V=1)
 
 %bcond_with    fbcondecor      # build fbcondecor (disable FB_TILEBLITTING and affected fb modules)
-%bcond_without pae             # build PAE (HIGHMEM64G) support on 32bit i686 athlon pentium3 pentium4
+%bcond_with    pae             # build PAE (HIGHMEM64G) support on 32bit i686 athlon pentium3 pentium4
 %bcond_with    nfsroot         # build with root on NFS support
 
 %bcond_without imq             # imq support
@@ -68,8 +68,8 @@
 %endif
 
 %define                rel             1
-%define                basever         5.5
-%define                postver         .0
+%define                basever         5.6
+%define                postver         .1
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -93,8 +93,8 @@
 %if %{with vanilla}
 %define                alt_kernel      vanilla
 %endif
-%if %{without pae}
-%define                alt_kernel      nopae
+%if %{with pae}
+%define                alt_kernel      pae
 %endif
 %if %{with rt}
 %define                alt_kernel      rt
@@ -120,10 +120,10 @@ Epoch:            3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5: 0a78b1dc48dc032fe505b170c1b92339
+# Source0-md5: 7b9199ec5fa563ece9ed585ffb17798f
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  bbb20c60fad075793e7a1be91051595e
+# Patch0-md5:  e59edecce5fb2839c9951ab8dad50e48
 %endif
 Source1:       kernel.sysconfig
 
@@ -304,7 +304,7 @@ Conflicts:  udev < 1:081
 Conflicts:     util-linux < 2.10o
 Conflicts:     util-vserver < 0.30.216
 Conflicts:     xfsprogs < 2.6.0
-%if %{without pae}
+%if %{with pae}
 ExclusiveArch: i686 pentium3 pentium4 athlon
 %else
 ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha arm ia64 ppc ppc64 sparc sparc64
@@ -1276,8 +1276,6 @@ fi
 %if %{without rescuecd}
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/avm_cs.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/b1pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/legacy/g_midi.ko*
 %endif
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
@@ -1357,8 +1355,6 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko*
 %if %{without rescuecd}
 /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/avm_cs.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/b1pcmcia.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %endif
 /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
@@ -1480,6 +1476,7 @@ fi
 %{_kernelsrcdir}/arch/m68k/install.sh
 %{_kernelsrcdir}/arch/parisc/install.sh
 %{_kernelsrcdir}/arch/x86/ia32/[!M]*
+%{_kernelsrcdir}/arch/powerpc/kexec
 %{_kernelsrcdir}/arch/powerpc/kvm
 %ifarch ppc ppc64
 %exclude %{_kernelsrcdir}/arch/powerpc/lib/crtsavres.*