just be more precise when updating shebangs

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 3eb5c5134e8a2191ccba727e23b45b6845feb2c6..486cee1ea72baf8c1b7f32965cf034741e79b81d 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,9 +71,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             1
-%define                basever         5.7
-%define                postver         .2
+%define                rel             0.1
+%define                basever         5.10
+%define                postver         .0
 
 # 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: f63ed18935914e1ee3e04c2a0ce1ba3b
+# Source0-md5: 753adc474bf799d569dec4f165ed92c3
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  7dbd8df264550584e43dfc512c2b9acd
+# Patch0-md5:  d7f9892b339f14f5d2afa6bfb842b1f4
 %endif
 Source1:       kernel.sysconfig
 
@@ -201,7 +201,7 @@ Patch101:   kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs5-standalone.git
 # cd aufs5-standalone
-# git checkout -b aufs5.4 origin/aufs5.4
+# git checkout -b aufs5.8 origin/aufs5.8
 # cat aufs5-kbuild.patch aufs5-base.patch aufs5-mmap.patch aufs5-standalone.patch > ~/rpm/packages/kernel/kernel-aufs5.patch
 # rm -rf linux && mkdir linux; cp -a Documentation fs include linux
 # diff -urN /usr/share/empty linux | filterdiff -x linux/include/uapi/linux/Kbuild >> ~/rpm/packages/kernel/kernel-aufs5.patch
@@ -220,12 +220,14 @@ Patch500: kernel-rt.patch
 Patch2000:     kernel-small_fixes.patch
 Patch2001:     kernel-pwc-uncompress.patch
 Patch2003:     kernel-regressions.patch
-Patch2004:     xfs-reclaim-hack.patch
 
 # for rescuecd
 # based on ftp://ftp.leg.uct.ac.za/pub/linux/rip/tmpfs_root-2.6.30.diff.gz
 Patch7000:     kernel-inittmpfs.patch
 
+# ARM only
+Patch8000:     rpi-wm8804.patch
+
 # Do not remove this line, please. It is easier for me to uncomment two lines, then patch
 # kernel.spec every time.
 #Patch50000:   kernel-usb_reset.patch
@@ -248,6 +250,7 @@ BuildRequires:      hostname
 BuildRequires: kmod >= %{kmod_ver}
 BuildRequires: libstdc++-devel
 BuildRequires: openssl-devel
+BuildRequires: openssl-tools
 BuildRequires: perl-base
 BuildRequires: rpm-build >= 4.5-24
 BuildRequires: rpmbuild(macros) >= 1.743
@@ -293,6 +296,7 @@ Obsoletes:  kernel-smp
 Conflicts:     e2fsprogs < 1.29
 Conflicts:     isdn4k-utils < 3.1pre1
 Conflicts:     jfsutils < 1.1.3
+Conflicts:     libcap-libs < 1:2.34
 Conflicts:     libusb < 1.0.9
 Conflicts:     linux-firmware < 20120720
 Conflicts:     lvm2 < 2.02.40
@@ -454,6 +458,7 @@ Summary(pl.UTF-8):  Sterowniki DRM
 Group:         Base/Kernel
 Requires(postun):      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      kernel(vboxvideo) = %{kernel_release}
 Obsoletes:     kernel-smp-drm
 AutoReqProv:   no
 
@@ -690,6 +695,10 @@ cd linux-%{basever}
 %patch7000 -p1
 %endif
 
+%ifarch %{arm} aarch64
+%patch8000 -p1
+%endif
+
 %if %{with rt}
 %patch500 -p1
 rm -f localversion-rt
@@ -703,7 +712,6 @@ rm -f localversion-rt
 %patch2000 -p1
 %patch2001 -p1
 #%patch2003 -p1
-%patch2004 -p1
 
 # Do not remove this, please!
 #%%patch50000 -p1
@@ -717,20 +725,21 @@ 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 \
        scripts/jobserver-exec \
        scripts/show_delta \
        tools/hv/vmbus_testing \
-       tools/kvm/kvm_stat/kvm_stat
+       tools/kvm/kvm_stat/kvm_stat \
+       tools/testing/selftests/exec/binfmt_script
 
 find -name '*.pl' -print0 | \
        xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
@@ -1100,7 +1109,6 @@ mv $RPM_BUILD_ROOT{%{_kernelsrcdir}/Documentation,%{_docdir}/%{name}-%{version}}
 
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/dontdiff
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/Makefile
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/*/Makefile
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/*/*/Makefile
 %else
 %{__rm} -r $RPM_BUILD_ROOT%{_kernelsrcdir}/Documentation
@@ -1465,7 +1473,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
@@ -1486,7 +1493,6 @@ fi
 %dir %{_docdir}/%{name}-%{version}
 
 %{_docdir}/%{name}-%{version}/[!jkz]*
-%{_docdir}/%{name}-%{version}/[jkz]*.txt
 %{_docdir}/%{name}-%{version}/kbuild
 %{_docdir}/%{name}-%{version}/kernel-hacking
 %endif
@@ -1512,6 +1518,7 @@ 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