- 6.4.12

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index a0b46b50638a74b6d09c2de2a2700b1111b705f4..866d7ec57be40e8788775bab832ad52f6dcb700e 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,8 +66,8 @@
 %endif
 
 %define                rel             1
-%define                basever         6.0
-%define                postver         .2
+%define                basever         6.4
+%define                postver         .12
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -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: bb65b2232cf596e7044c56a7c4205f51
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5:  30c354f634839f1c94f09872f4d9b76b
+# Patch0-md5:  8e950aaeded83ce47ff85cae9771ca6a
 %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,8 +191,9 @@ 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
+Patch147:      kernel-aufs-make.patch
 
 # Show normal colors in menuconfig with ncurses ABI 6
 Patch250:      kernel-fix_256colors_menuconfig.patch
@@ -216,6 +214,8 @@ Patch7000:  kernel-inittmpfs.patch
 Patch8000:     rpi-sound.patch
 Patch8001:     kernel-pinebook-pro.patch
 Patch8002:     atheros-disallow-retrain-nongen1-pcie.patch
+Patch8004:     ath-regd.patch
+Patch8005:     rkvdec-hevc.patch
 
 # Do not remove this line, please. It is easier for me to uncomment two lines, then patch
 # kernel.spec every time.
@@ -611,6 +611,7 @@ cd linux-%{basever}
 %endif
 
 %if %{without vanilla}
+%patch2 -p1
 
 %if %{with fbcondecor}
 %patch3 -p1
@@ -628,9 +629,6 @@ cd linux-%{basever}
 %patch37 -p1
 %endif
 
-# kernel-layer7.patch
-%patch40 -p1
-
 ##
 # end of netfilter
 
@@ -654,8 +652,9 @@ cd linux-%{basever}
 %endif
 
 %if %{with aufs}
-# aufs4
+# aufs
 %patch145 -p1
+%patch147 -p1
 %if %{with vserver}
 %patch146 -p1
 %endif
@@ -669,6 +668,8 @@ cd linux-%{basever}
 %patch8000 -p1
 %patch8001 -p1
 %patch8002 -p1
+%patch8004 -p1
+%patch8005 -p1
 %endif
 
 %if %{with rt}
@@ -704,9 +705,9 @@ find -name '*.py' -print0 | \
 %{__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/dtc/dt-extract-compatibles \
        scripts/jobserver-exec \
        scripts/show_delta \
        tools/hv/vmbus_testing \
@@ -729,7 +730,8 @@ find -name '*.pl' -print0 | \
 %{__sed} -i -e '1s,/usr/bin/env bash,%{__bash},' \
        tools/testing/selftests/powerpc/security/mitigation-patching.sh \
        scripts/config \
-       scripts/check-local-export
+       scripts/check-local-export \
+       scripts/coccicheck
 
 %build
 install -d %{objdir}
@@ -1315,7 +1317,6 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/fujitsu/fmvj18x_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/smsc/smc91c92_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/xircom/xirc2ps_cs.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/atmel/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/cisco/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/intersil/hostap/hostap_cs.ko*
@@ -1386,7 +1387,6 @@ fi
 /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/fujitsu/fmvj18x_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/smsc/smc91c92_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/xircom/xirc2ps_cs.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/net/wireless/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/atmel/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/cisco/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/intersil/hostap/hostap_cs.ko*
@@ -1524,6 +1524,7 @@ fi
 %{_kernelsrcdir}/mm
 %{_kernelsrcdir}/net
 %{_kernelsrcdir}/virt
+%{_kernelsrcdir}/rust
 %{_kernelsrcdir}/samples
 %{_kernelsrcdir}/scripts/*
 %exclude %{_kernelsrcdir}/scripts/Kbuild.include