diff --git a/.abf.yml b/.abf.yml index 951708d..b54666c 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,6 +1,6 @@ sources: linux-5.15.tar.xz: ac61f2459040c09af1d5abd4ed100c3d316b443e - patch-5.15.28.xz: 20337719e70d8bd465f2ffbccd84cd8c3b2b274b + patch-5.15.30.xz: 5547d0b15681f3bacd292cb5d99f34df54339880 public_key_GOST_1.pem: b4fb6bf1cf73824944931a8f0c2cb7bf427e0774 public_key_GOST_2.pem: cba209bd331f29031c5d945949b230a8d7a4dc12 public_key_GOST_3.pem: e5a223dd7c556d4d0cac326f5ed9fc12dd769afb diff --git a/kernel-i586.config b/kernel-i586.config index fa8fd3f..4299ed2 100644 --- a/kernel-i586.config +++ b/kernel-i586.config @@ -3726,6 +3726,7 @@ CONFIG_MT7663_USB_SDIO_COMMON=m CONFIG_MT7663U=m CONFIG_MT7663S=m CONFIG_MT7915E=m +CONFIG_MT7921E=m CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WILC1000=m CONFIG_WILC1000_SDIO=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 7611400..dc9c11e 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3758,6 +3758,7 @@ CONFIG_MT7663_USB_SDIO_COMMON=m CONFIG_MT7663U=m CONFIG_MT7663S=m CONFIG_MT7915E=m +CONFIG_MT7921E=m CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WILC1000=m CONFIG_WILC1000_SDIO=m diff --git a/kernel.spec b/kernel.spec index da56e7b..2ede25d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -29,7 +29,7 @@ %define kernelversion 5 %define patchlevel 15 -%define sublevel 28 +%define sublevel 30 # Release number. Increase this before a rebuild. %define rpmrel 1 @@ -201,7 +201,7 @@ cat %{_builddir}/debugfiles.list >> %{debuginfo_files} %define build_debug 1 # Build kernel-headers package -%define build_headers 1 +%define build_headers 0 # Build perf and cpupower tools %define build_perf 1 @@ -478,6 +478,8 @@ Requires(posttrans): kmod >= 28-3 # Usually necessary, but sometimes user may want to not install them Recommends: crda +# Need for virtualbox host +Recommends: (kernel-%{tar_ver}-generic-devel if dkms) Recommends: linux-firmware Recommends: microcode # Set BFQ as default scheduler for HDDs @@ -759,6 +761,7 @@ The package contains perf tool and the supporting documentation. %{_bindir}/perf-read-vdso32 %endif %{_bindir}/trace +%{_includedir}/perf/perf_dlfilter.h %dir %{_prefix}/libexec/perf-core %dir %{_libdir}/traceevent %dir %{_libdir}/traceevent/plugins @@ -850,6 +853,9 @@ should use the 'kernel-devel' package instead. %exclude %{_includedir}/cpufreq.h %exclude %{_includedir}/cpuidle.h %endif +%if %{build_perf} +%exclude %{_includedir}/perf/perf_dlfilter.h +%endif %endif ############################################################################