add fixes for pinebook pro

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 3a5b943e5f48a8fd2a81d9d06bbcdd1dc597c93b..600a25a6d8fcb26fb1a57fa3d77236fcd7f7bce6 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -72,8 +72,8 @@
 %endif
 
 %define                rel             1
-%define                basever         5.9
-%define                postver         .14
+%define                basever         5.10
+%define                postver         .15
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -124,10 +124,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: 0959d759fd19e146367221aff504ad91
+# 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.
@@ -697,6 +699,8 @@ cd linux-%{basever}
 
 %ifarch %{arm} aarch64
 %patch8000 -p1
+%patch8001 -p1
+%patch8002 -p1
 %endif
 
 %if %{with rt}
@@ -725,13 +729,13 @@ sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:.%{alt_kernel}}#g' Makef
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
 
 find -name '*.py' -print0 | \
-       xargs -0 %{__sed} -i -e '1s,/usr/bin/python,%{__python},' \
-                            -e '1s,/usr/bin/env python,%{__python},' \
-                            -e '1s,/usr/bin/env python3,%{__python3},'
+       xargs -0 %{__sed} -i -e '1s,/usr/bin/python$,%{__python},' \
+                            -e '1s,/usr/bin/env python$,%{__python},' \
+                            -e '1s,/usr/bin/env python3$,%{__python3},'
 
-%{__sed} -i -e '1s,/usr/bin/python,%{__python},' \
-           -e '1s,/usr/bin/env python,%{__python},' \
-           -e '1s,/usr/bin/env python3,%{__python3},' \
+%{__sed} -i -e '1s,/usr/bin/python$,%{__python},' \
+           -e '1s,/usr/bin/env python$,%{__python},' \
+           -e '1s,/usr/bin/env python3$,%{__python3},' \
        drivers/staging/greybus/tools/lbtest \
        scripts/bloat-o-meter \
        scripts/diffconfig \
@@ -911,6 +915,10 @@ BuildConfig() {
                CONFIG_NFS_FS=y
                CONFIG_ROOT_NFS=y
 %endif
+
+%ifarch x32
+               CONFIG_BPF_PRELOAD=n
+%endif
 EOCONFIG
 
 %if %{with rescuecd}
@@ -1450,7 +1458,6 @@ fi
 %endif
 %exclude %dir %{_kernelsrcdir}/arch/um
 %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
-%{_kernelsrcdir}/arch/*/kernel/module.lds
 %{_kernelsrcdir}/arch/*/kernel/sigframe*.h
 %{_kernelsrcdir}/drivers/media/pci/bt8xx/bttv.h
 %{_kernelsrcdir}/kernel/bounds.c
@@ -1474,7 +1481,6 @@ fi
 %{_kernelsrcdir}/scripts/mod/modpost.h
 %attr(755,root,root) %{_kernelsrcdir}/scripts/mkcompile_h
 %{_kernelsrcdir}/scripts/mkmakefile
-%{_kernelsrcdir}/scripts/module-common.lds
 %attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion
 %{_kernelsrcdir}/scripts/subarch.include
 %{_kernelsrcdir}/scripts/*.c
@@ -1520,7 +1526,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
@@ -1545,7 +1550,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