X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=2518c44d91e15fd2b4c84299c4fd8e5604b2b1a1;hb=0e8ecf40647490d5103ffef773aa11adf0e0376d;hp=59397f399b40afd2ba2af2752f6ed6c25853230a;hpb=f63317a745dc267d7ee1e37eaa154125a4028b61;p=packages%2Fkernel.git diff --git a/kernel.spec b/kernel.spec index 59397f39..2518c44d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -66,8 +66,8 @@ %endif %define rel 1 -%define basever 5.19 -%define postver .10 +%define basever 6.6 +%define postver .4 # define this to '-%{basever}' for longterm branch %define versuffix %{nil} @@ -117,11 +117,11 @@ Release: %{rel} Epoch: 3 License: GPL v2 Group: Base/Kernel -Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz -# Source0-md5: f91bfe133d2cb1692f705947282e123a +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/v5.x/patch-%{version}.xz -# Patch0-md5: 5cbd0c86c42318067a64ccbb626afad9 +Patch0: https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz +# Patch0-md5: 0d2c1c3ef1c023d9c5f34d19eaad4cb0 %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 @@ -206,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 @@ -216,6 +213,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 +610,7 @@ cd linux-%{basever} %endif %if %{without vanilla} +%patch2 -p1 %if %{with fbcondecor} %patch3 -p1 @@ -628,9 +628,6 @@ cd linux-%{basever} %patch37 -p1 %endif -# kernel-layer7.patch -%patch40 -p1 - ## # end of netfilter @@ -654,8 +651,9 @@ cd linux-%{basever} %endif %if %{with aufs} -# aufs4 +# aufs %patch145 -p1 +%patch147 -p1 %if %{with vserver} %patch146 -p1 %endif @@ -669,6 +667,8 @@ cd linux-%{basever} %patch8000 -p1 %patch8001 -p1 %patch8002 -p1 +%patch8004 -p1 +%patch8005 -p1 %endif %if %{with rt} @@ -683,7 +683,6 @@ rm -f localversion-rt # Small fixes: %patch2000 -p1 %patch2001 -p1 -#%patch2003 -p1 # Do not remove this, please! #%%patch50000 -p1 @@ -704,9 +703,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 +728,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} @@ -1315,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* @@ -1386,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* @@ -1460,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 @@ -1516,6 +1512,7 @@ fi %{_kernelsrcdir}/drivers %{_kernelsrcdir}/fs %{_kernelsrcdir}/init +%{_kernelsrcdir}/io_uring %{_kernelsrcdir}/ipc %{_kernelsrcdir}/kernel %exclude %{_kernelsrcdir}/kernel/bounds.c @@ -1523,6 +1520,7 @@ fi %{_kernelsrcdir}/mm %{_kernelsrcdir}/net %{_kernelsrcdir}/virt +%{_kernelsrcdir}/rust %{_kernelsrcdir}/samples %{_kernelsrcdir}/scripts/* %exclude %{_kernelsrcdir}/scripts/Kbuild.include