- rel 2

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 0a07d221e684e2643896f0b8a33a7259715da17f..1ae9cbb035580a89ab577bdd010e6d95c0160551 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -25,7 +25,6 @@
 %bcond_with    pae             # build PAE (HIGHMEM64G) support on 32bit i686 athlon pentium3 pentium4
 %bcond_with    nfsroot         # build with root on NFS support
 
-%bcond_without imq             # imq support
 %bcond_without ipv6            # ipv6 support
 
 %bcond_without aufs            # aufs4 support
@@ -65,9 +64,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             1
-%define                basever         6.1
-%define                postver         .0
+%define                rel             2
+%define                basever         6.6
+%define                postver         .4
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -118,10 +117,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: 452098d80ba925af3a4ab35998f3aef5
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5:  b3c6eed24d72560fe68ed5c52f73e8ef
+# Patch0-md5:  0d2c1c3ef1c023d9c5f34d19eaad4cb0
 %endif
 Source1:       kernel.sysconfig
 
@@ -147,11 +146,9 @@ Source41:  kernel-patches.config
 Source43:      kernel-vserver.config
 Source44:      kernel-rt.config
 
-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
 Patch6:                linux-wistron-nx.patch
@@ -167,9 +164,6 @@ Patch37:    kernel-owner-xid.patch
 
 ### End netfilter
 
-# http://www.linuximq.net
-Patch50:       kernel-imq.patch
-
 # by Baggins request:
 # derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs
 Patch55:       kernel-atm-vbr.patch
@@ -193,6 +187,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
@@ -203,7 +198,6 @@ Patch500:   kernel-rt.patch
 
 Patch2000:     kernel-small_fixes.patch
 Patch2001:     kernel-pwc-uncompress.patch
-Patch2003:     kernel-regressions.patch
 
 # for rescuecd
 # based on ftp://ftp.leg.uct.ac.za/pub/linux/rip/tmpfs_root-2.6.30.diff.gz
@@ -213,8 +207,10 @@ 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
+Patch8004:     ath-regd.patch
+Patch8005:     rkvdec-hevc.patch
+
+Patch9000:     neighbour-randomize-layout-crash.patch
 
 # Do not remove this line, please. It is easier for me to uncomment two lines, then patch
 # kernel.spec every time.
@@ -610,7 +606,7 @@ cd linux-%{basever}
 %endif
 
 %if %{without vanilla}
-%patch1 -p1
+%patch2 -p1
 
 %if %{with fbcondecor}
 %patch3 -p1
@@ -631,10 +627,6 @@ cd linux-%{basever}
 ##
 # end of netfilter
 
-%if %{with imq}
-#%patch50 -p1
-%endif
-
 %patch55 -p1
 %patch56 -p1
 
@@ -651,8 +643,9 @@ cd linux-%{basever}
 %endif
 
 %if %{with aufs}
-# aufs4
+# aufs
 %patch145 -p1
+%patch147 -p1
 %if %{with vserver}
 %patch146 -p1
 %endif
@@ -666,10 +659,12 @@ cd linux-%{basever}
 %patch8000 -p1
 %patch8001 -p1
 %patch8002 -p1
-%patch8003 -p1
 %patch8004 -p1
+%patch8005 -p1
 %endif
 
+%patch9000 -p1
+
 %if %{with rt}
 %patch500 -p1
 rm -f localversion-rt
@@ -682,7 +677,6 @@ rm -f localversion-rt
 # Small fixes:
 %patch2000 -p1
 %patch2001 -p1
-#%patch2003 -p1
 
 # Do not remove this, please!
 #%%patch50000 -p1
@@ -703,7 +697,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 \
@@ -729,7 +722,7 @@ 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/coccicheck
 
 %build
 install -d %{objdir}
@@ -916,9 +909,6 @@ EOCONFIG
                rescue.config \
 %endif
                \
-%if %{with imq}
-               %{SOURCE55} \
-%endif
 %if %{with vserver}
                %{SOURCE43} \
 %endif
@@ -1143,6 +1133,11 @@ if [[ "$CREATE_SYMLINKS" != [Nn][Oo] ]]; then
        mv -f /boot/System%{_alt_kernel}.map{,.old} 2> /dev/null
        ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz%{_alt_kernel}
        ln -sf System.map-%{kernel_release} /boot/System.map%{_alt_kernel}
+%ifarch %{arm} aarch64
+       test -L /boot/dtb%{_alt_kernel}.old && rm /boot/dtb%{_alt_kernel}.old
+       test ! -e /boot/dtb%{_alt_kernel}.old && mv -f /boot/dtb%{_alt_kernel}{,.old} 2> /dev/null
+       ln -sf dtb-%{kernel_release} /boot/dtb%{_alt_kernel}
+%endif
 %endif
 fi
 
@@ -1315,7 +1310,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 +1380,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*
@@ -1460,7 +1453,6 @@ fi
 %{_kernelsrcdir}/scripts/kconfig/lxdialog
 %{_kernelsrcdir}/scripts/mod/*.c
 %{_kernelsrcdir}/scripts/mod/modpost.h
-%attr(755,root,root) %{_kernelsrcdir}/scripts/check-local-export
 %attr(755,root,root) %{_kernelsrcdir}/scripts/mkcompile_h
 %attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion
 %{_kernelsrcdir}/scripts/subarch.include
@@ -1524,6 +1516,7 @@ fi
 %{_kernelsrcdir}/mm
 %{_kernelsrcdir}/net
 %{_kernelsrcdir}/virt
+%{_kernelsrcdir}/rust
 %{_kernelsrcdir}/samples
 %{_kernelsrcdir}/scripts/*
 %exclude %{_kernelsrcdir}/scripts/Kbuild.include