updated noarch rules

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index d20e4ca1676c853f71e5527bdd503c84ce4f2623..6782a3fedd76c463c92ab611569063b42ef1e6c0 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
 
 %define                rel             1
 %define                basever         5.10
-%define                postver         .0
+%define                postver         .15
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -127,7 +127,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: 753adc474bf799d569dec4f165ed92c3
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  d7f9892b339f14f5d2afa6bfb842b1f4
+# Patch0-md5:  e42919d9469abc938a9e1efc7a9abb72
 %endif
 Source1:       kernel.sysconfig
 
@@ -227,6 +227,8 @@ Patch7000:  kernel-inittmpfs.patch
 
 # ARM only
 Patch8000:     rpi-wm8804.patch
+Patch8001:     kernel-pinebook-pro.patch
+Patch8002:     kernel-rk3399-afbc-ytr.patch
 
 # Do not remove this line, please. It is easier for me to uncomment two lines, then patch
 # kernel.spec every time.
@@ -253,7 +255,7 @@ BuildRequires:      openssl-devel
 BuildRequires: openssl-tools
 BuildRequires: perl-base
 BuildRequires: rpm-build >= 4.5-24
-BuildRequires: rpmbuild(macros) >= 1.743
+BuildRequires: rpmbuild(macros) >= 1.752
 %ifarch ppc
 BuildRequires: uboot-mkimage
 %endif
@@ -581,9 +583,7 @@ Summary(pl.UTF-8):  Kod źródłowy jądra Linuksa
 Group:         Development/Building
 Requires:      %{name}-module-build = %{epoch}:%{version}-%{release}
 AutoReqProv:   no
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description source
 This is the source code for the Linux kernel. You can build a custom
@@ -614,9 +614,7 @@ Summary(de.UTF-8):  Kernel Dokumentation
 Summary(pl.UTF-8):     Dokumentacja do jądra Linuksa
 Group:         Documentation
 AutoReqProv:   no
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description doc
 This is the documentation for the Linux kernel, as found in
@@ -697,6 +695,8 @@ cd linux-%{basever}
 
 %ifarch %{arm} aarch64
 %patch8000 -p1
+%patch8001 -p1
+%patch8002 -p1
 %endif
 
 %if %{with rt}
@@ -911,6 +911,10 @@ BuildConfig() {
                CONFIG_NFS_FS=y
                CONFIG_ROOT_NFS=y
 %endif
+
+%ifarch x32
+               CONFIG_BPF_PRELOAD=n
+%endif
 EOCONFIG
 
 %if %{with rescuecd}
@@ -1518,7 +1522,6 @@ fi
 %{_kernelsrcdir}/arch/s390/kvm
 %{_kernelsrcdir}/arch/x86/kvm
 %exclude %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
-%exclude %{_kernelsrcdir}/arch/*/kernel/module.lds
 %exclude %{_kernelsrcdir}/arch/*/kernel/sigframe*.h
 %exclude %{_kernelsrcdir}/drivers/media/pci/bt8xx/bttv.h
 %{_kernelsrcdir}/block
@@ -1543,7 +1546,6 @@ fi
 %exclude %{_kernelsrcdir}/scripts/mkcompile_h
 %exclude %{_kernelsrcdir}/scripts/mkmakefile
 %exclude %{_kernelsrcdir}/scripts/mod
-%exclude %{_kernelsrcdir}/scripts/module-common.lds
 %exclude %{_kernelsrcdir}/scripts/setlocalversion
 %exclude %{_kernelsrcdir}/scripts/subarch.include
 %exclude %{_kernelsrcdir}/scripts/*.c