up to 6.4.4

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 7a4deee3b1c74332b93b17a8548920ec0761c0b9..39a8a27c97330308e206369df9aadc055de91d8d 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,8 +66,8 @@
 %endif
 
 %define                rel             1
-%define                basever         6.1
-%define                postver         .1
+%define                basever         6.4
+%define                postver         .4
 
 # 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: 475320de08f16c9fa486fc4edfe98b30
+# Source0-md5: bb65b2232cf596e7044c56a7c4205f51
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5:  205ec3e9b639a440fda3cab9569693a8
+# Patch0-md5:  4eeb45a4ee0a9bb0cbde62ba2cf645f9
 %endif
 Source1:       kernel.sysconfig
 
@@ -151,7 +151,6 @@ Source55:   kernel-imq.config
 
 Source58:      kernel-inittmpfs.config
 
-Patch1:                make-4.4.patch
 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
@@ -194,6 +193,7 @@ Patch101:   kernel-vserver-fixes.patch
 # see update-source.sh
 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
@@ -214,8 +214,9 @@ 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
-Patch8004:     typec-tcpm-fixes.patch
+Patch8003:     unbreak-pci-mvebu.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,7 +612,6 @@ cd linux-%{basever}
 %endif
 
 %if %{without vanilla}
-%patch1 -p1
 %patch2 -p1
 
 %if %{with fbcondecor}
@@ -653,8 +653,9 @@ cd linux-%{basever}
 %endif
 
 %if %{with aufs}
-# aufs4
+# aufs
 %patch145 -p1
+%patch147 -p1
 %if %{with vserver}
 %patch146 -p1
 %endif
@@ -670,6 +671,7 @@ cd linux-%{basever}
 %patch8002 -p1
 %patch8003 -p1
 %patch8004 -p1
+%patch8005 -p1
 %endif
 
 %if %{with rt}
@@ -705,7 +707,6 @@ 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 \
@@ -731,7 +732,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}
@@ -1317,7 +1319,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*
@@ -1388,7 +1389,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*
@@ -1526,6 +1526,7 @@ fi
 %{_kernelsrcdir}/mm
 %{_kernelsrcdir}/net
 %{_kernelsrcdir}/virt
+%{_kernelsrcdir}/rust
 %{_kernelsrcdir}/samples
 %{_kernelsrcdir}/scripts/*
 %exclude %{_kernelsrcdir}/scripts/Kbuild.include