Djam/kernel-6.6
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-6.6.git synced 2025-02-25 11:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable mt7921e. Disable kernel-headers (use main release kernel-headers), move perf header to perf. Add recommends for devel when installed dkms (?). Update to 5.15.30.

Browse source
This commit is contained in:
survolog (Andrey Grigorev) 2022-03-23 12:00:37 +03:00
parent 3136620039
commit 558f638df8
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,6 +1,6 @@
sources: sources:
linux-5.15.tar.xz: ac61f2459040c09af1d5abd4ed100c3d316b443e 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_1.pem: b4fb6bf1cf73824944931a8f0c2cb7bf427e0774
public_key_GOST_2.pem: cba209bd331f29031c5d945949b230a8d7a4dc12 public_key_GOST_2.pem: cba209bd331f29031c5d945949b230a8d7a4dc12
public_key_GOST_3.pem: e5a223dd7c556d4d0cac326f5ed9fc12dd769afb public_key_GOST_3.pem: e5a223dd7c556d4d0cac326f5ed9fc12dd769afb

1
kernel-i586.config
View file

@ -3726,6 +3726,7 @@ CONFIG_MT7663_USB_SDIO_COMMON=m
CONFIG_MT7663U=m CONFIG_MT7663U=m
CONFIG_MT7663S=m CONFIG_MT7663S=m
CONFIG_MT7915E=m CONFIG_MT7915E=m
CONFIG_MT7921E=m
CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WLAN_VENDOR_MICROCHIP=y
CONFIG_WILC1000=m CONFIG_WILC1000=m
CONFIG_WILC1000_SDIO=m CONFIG_WILC1000_SDIO=m

1
kernel-x86_64.config
View file

@ -3758,6 +3758,7 @@ CONFIG_MT7663_USB_SDIO_COMMON=m
CONFIG_MT7663U=m CONFIG_MT7663U=m
CONFIG_MT7663S=m CONFIG_MT7663S=m
CONFIG_MT7915E=m CONFIG_MT7915E=m
CONFIG_MT7921E=m
CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WLAN_VENDOR_MICROCHIP=y
CONFIG_WILC1000=m CONFIG_WILC1000=m
CONFIG_WILC1000_SDIO=m CONFIG_WILC1000_SDIO=m

10
kernel.spec
View file

@ -29,7 +29,7 @@
%define kernelversion 5 %define kernelversion 5
%define patchlevel 15 %define patchlevel 15
%define sublevel 28 %define sublevel 30
# Release number. Increase this before a rebuild. # Release number. Increase this before a rebuild.
%define rpmrel 1 %define rpmrel 1
@ -201,7 +201,7 @@ cat %{_builddir}/debugfiles.list >> %{debuginfo_files}
%define build_debug 1 %define build_debug 1
# Build kernel-headers package # Build kernel-headers package
%define build_headers 1 %define build_headers 0
# Build perf and cpupower tools # Build perf and cpupower tools
%define build_perf 1 %define build_perf 1
@ -478,6 +478,8 @@ Requires(posttrans): kmod >= 28-3
# Usually necessary, but sometimes user may want to not install them # Usually necessary, but sometimes user may want to not install them
Recommends: crda Recommends: crda
# Need for virtualbox host
Recommends: (kernel-%{tar_ver}-generic-devel if dkms)
Recommends: linux-firmware Recommends: linux-firmware
Recommends: microcode Recommends: microcode
# Set BFQ as default scheduler for HDDs # Set BFQ as default scheduler for HDDs
@ -759,6 +761,7 @@ The package contains perf tool and the supporting documentation.
%{_bindir}/perf-read-vdso32 %{_bindir}/perf-read-vdso32
%endif %endif
%{_bindir}/trace %{_bindir}/trace
%{_includedir}/perf/perf_dlfilter.h
%dir %{_prefix}/libexec/perf-core %dir %{_prefix}/libexec/perf-core
%dir %{_libdir}/traceevent %dir %{_libdir}/traceevent
%dir %{_libdir}/traceevent/plugins %dir %{_libdir}/traceevent/plugins
@ -850,6 +853,9 @@ should use the 'kernel-devel' package instead.
%exclude %{_includedir}/cpufreq.h %exclude %{_includedir}/cpufreq.h
%exclude %{_includedir}/cpuidle.h %exclude %{_includedir}/cpuidle.h
%endif %endif
%if %{build_perf}
%exclude %{_includedir}/perf/perf_dlfilter.h
%endif
%endif %endif
############################################################################ ############################################################################