Up to 6.1.86

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 2cb93f85fdf93b0ac8f14918baa6771c9db664ca..9a743e90f065421ab8a73bd66edec3c96cce1217 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,11 +66,11 @@
 %endif
 
 %define                rel             1
-%define                basever         6.0
-%define                postver         .3
+%define                basever         6.1
+%define                postver         .86
 
 # define this to '-%{basever}' for longterm branch
-%define                versuffix       %{nil}
+%define                versuffix       -%{basever}
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -118,10 +118,10 @@ Epoch:            3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
-# Source0-md5: d681bd1d62d48049a4874646f6774d92
+# Source0-md5: 475320de08f16c9fa486fc4edfe98b30
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5:  ad711c00bda19988c7d063851ab80c34
+# Patch0-md5:  875581b5532bdcaf6dee591711794b20
 %endif
 Source1:       kernel.sysconfig
 
@@ -151,6 +151,7 @@ Source55:   kernel-imq.config
 
 Source58:      kernel-inittmpfs.config
 
+Patch2:                android-enable-building-binder-as-module.patch
 # http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch
 Patch3:                kernel-fbcondecor.patch
 Patch6:                linux-wistron-nx.patch
@@ -164,10 +165,6 @@ Patch10:   kernel-pom-ng-IPV4OPTSSTRIP.patch
 # http://ftp.linux-vserver.org/pub/people/dhozac/p/k/delta-owner-xid-feat02.diff
 Patch37:       kernel-owner-xid.patch
 
-# based on kernel-2.6.25-layer7-2.20.patch from
-# http://switch.dl.sourceforge.net/sourceforge/l7-filter/netfilter-layer7-v2.20.tar.gz
-Patch40:       kernel-layer7.patch
-
 ### End netfilter
 
 # http://www.linuximq.net
@@ -194,7 +191,7 @@ Patch100:   kernel-vserver-2.3.patch
 Patch101:      kernel-vserver-fixes.patch
 
 # see update-source.sh
-Patch145:      kernel-aufs5.patch
+Patch145:      kernel-aufs.patch
 Patch146:      kernel-aufs+vserver.patch
 
 # Show normal colors in menuconfig with ncurses ABI 6
@@ -216,6 +213,7 @@ Patch7000:  kernel-inittmpfs.patch
 Patch8000:     rpi-sound.patch
 Patch8001:     kernel-pinebook-pro.patch
 Patch8002:     atheros-disallow-retrain-nongen1-pcie.patch
+Patch8003:     odroid-n2-fan.patch
 
 # Do not remove this line, please. It is easier for me to uncomment two lines, then patch
 # kernel.spec every time.
@@ -611,6 +609,7 @@ cd linux-%{basever}
 %endif
 
 %if %{without vanilla}
+%patch2 -p1
 
 %if %{with fbcondecor}
 %patch3 -p1
@@ -628,9 +627,6 @@ cd linux-%{basever}
 %patch37 -p1
 %endif
 
-# kernel-layer7.patch
-%patch40 -p1
-
 ##
 # end of netfilter
 
@@ -669,6 +665,7 @@ cd linux-%{basever}
 %patch8000 -p1
 %patch8001 -p1
 %patch8002 -p1
+%patch8003 -p1
 %endif
 
 %if %{with rt}
@@ -707,6 +704,7 @@ find -name '*.py' -print0 | \
        drivers/staging/greybus/tools/lbtest \
        scripts/bloat-o-meter \
        scripts/diffconfig \
+       scripts/dtc/dt-extract-compatibles \
        scripts/jobserver-exec \
        scripts/show_delta \
        tools/hv/vmbus_testing \
@@ -1524,6 +1522,7 @@ fi
 %{_kernelsrcdir}/mm
 %{_kernelsrcdir}/net
 %{_kernelsrcdir}/virt
+%{_kernelsrcdir}/rust
 %{_kernelsrcdir}/samples
 %{_kernelsrcdir}/scripts/*
 %exclude %{_kernelsrcdir}/scripts/Kbuild.include