- rel 2

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 916f1e69f29af9af99cdf05189667638d5a68ffc..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                rel             2
 %define                basever         6.6
-%define                postver         .3
+%define                postver         .4
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -121,7 +120,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
 # Source0-md5: 452098d80ba925af3a4ab35998f3aef5
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5:  d5e8ba4eb7c280e55e6f84dfa4ac1283
+# Patch0-md5:  0d2c1c3ef1c023d9c5f34d19eaad4cb0
 %endif
 Source1:       kernel.sysconfig
 
@@ -147,8 +146,6 @@ Source41:   kernel-patches.config
 Source43:      kernel-vserver.config
 Source44:      kernel-rt.config
 
-Source55:      kernel-imq.config
-
 Source58:      kernel-inittmpfs.config
 
 Patch2:                android-enable-building-binder-as-module.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
@@ -204,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
@@ -217,6 +210,8 @@ Patch8002:  atheros-disallow-retrain-nongen1-pcie.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.
 #Patch50000:   kernel-usb_reset.patch
@@ -632,10 +627,6 @@ cd linux-%{basever}
 ##
 # end of netfilter
 
-%if %{with imq}
-#%patch50 -p1
-%endif
-
 %patch55 -p1
 %patch56 -p1
 
@@ -672,6 +663,8 @@ cd linux-%{basever}
 %patch8005 -p1
 %endif
 
+%patch9000 -p1
+
 %if %{with rt}
 %patch500 -p1
 rm -f localversion-rt
@@ -684,7 +677,6 @@ rm -f localversion-rt
 # Small fixes:
 %patch2000 -p1
 %patch2001 -p1
-#%patch2003 -p1
 
 # Do not remove this, please!
 #%%patch50000 -p1
@@ -917,9 +909,6 @@ EOCONFIG
                rescue.config \
 %endif
                \
-%if %{with imq}
-               %{SOURCE55} \
-%endif
 %if %{with vserver}
                %{SOURCE43} \
 %endif
@@ -1144,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