X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=2518c44d91e15fd2b4c84299c4fd8e5604b2b1a1;hb=0e8ecf40647490d5103ffef773aa11adf0e0376d;hp=ff4d61e7ad8ea98c486971c00dea309477e0cdba;hpb=528701815e1d008a747a41987e9fa0cd4fad638c;p=packages%2Fkernel.git diff --git a/kernel.spec b/kernel.spec index ff4d61e7..2518c44d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ %endif %define rel 1 -%define basever 6.3 +%define basever 6.6 %define postver .4 # define this to '-%{basever}' for longterm branch @@ -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: df4f97e65bde4174dd8be2af836f28e1 +# Source0-md5: 452098d80ba925af3a4ab35998f3aef5 %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz -# Patch0-md5: 7631fac893c5b490c87edd4b12f03f3b +# Patch0-md5: 0d2c1c3ef1c023d9c5f34d19eaad4cb0 %endif Source1: kernel.sysconfig @@ -204,7 +204,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 @@ -214,7 +213,8 @@ Patch7000: kernel-inittmpfs.patch Patch8000: rpi-sound.patch Patch8001: kernel-pinebook-pro.patch Patch8002: atheros-disallow-retrain-nongen1-pcie.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. @@ -667,7 +667,8 @@ cd linux-%{basever} %patch8000 -p1 %patch8001 -p1 %patch8002 -p1 -%patch8003 -p1 +%patch8004 -p1 +%patch8005 -p1 %endif %if %{with rt} @@ -682,7 +683,6 @@ rm -f localversion-rt # Small fixes: %patch2000 -p1 %patch2001 -p1 -#%patch2003 -p1 # Do not remove this, please! #%%patch50000 -p1 @@ -703,7 +703,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 +728,6 @@ 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 @@ -1316,7 +1314,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* @@ -1387,7 +1384,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* @@ -1461,7 +1457,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