- up to 5.8.1

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index ef59809b134c774a75aa96c3c0e55a9dd64bf33f..9b02a6b79aab2b04831a75beefd68826d0a24068 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         .10
+%define                rel             0.1
+%define                basever         5.8
+%define                postver         .1
 
 # 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: 0e5c4c15266218ef26c50fac0016095b
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  59c35c151fece94808fe3964eac77d32
+# Patch0-md5:  987e4b7b28558b51c769121637cef827
 %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
@@ -293,6 +293,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
@@ -730,7 +731,8 @@ find -name '*.py' -print0 | \
        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 +1102,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
@@ -1442,6 +1443,7 @@ 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
@@ -1512,6 +1514,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