From dd8aef5452dc977d876bfdba694d32f47e1b5526 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Thu, 7 Oct 2021 00:45:03 +0300 Subject: [PATCH] Build broadcom-wl binary kernel module --- kernel.spec | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 9c2a9be..2a67f55 100644 --- a/kernel.spec +++ b/kernel.spec @@ -32,7 +32,7 @@ %define sublevel 70 # Release number. Increase this before a rebuild. -%define rpmrel 2 +%define rpmrel 3 %define fullrpmrel %{rpmrel} %define rpmtag %{disttag} @@ -439,6 +439,10 @@ BuildRequires: findutils util-linux %if %{with binary_extra_modules} BuildRequires: kernel-source-rtl8821ce BuildRequires: kernel-source-rtl8821cu +# broadcom-wl contains a proprietary blob which is only for x86 +%ifarch %{ix86} %{x86_64} +BuildRequires: kernel-source-broadcom-wl +%endif BuildRequires: kernel-source-tripso BuildRequires: kernel-source-ipt-so %if %{with binary_virtualbox_host} @@ -538,6 +542,9 @@ input and output, etc. This is a general-purpose kernel. # 8821ce.ko.debug will not be excluded and will be in the main debug subpackage %exclude %{_modulesdir}/%{kver_full}/kernel/net/wireless/8821ce.ko%{kmod_suffix} %exclude %{_modulesdir}/%{kver_full}/kernel/net/wireless/8821cu.ko%{kmod_suffix} +%ifarch %{ix86} %{x86_64} +%exclude %{_modulesdir}/%{kver_full}/kernel/net/wireless/wl.ko%{kmod_suffix} +%endif %if %{with binary_shredder} %exclude %{_modulesdir}/%{kver_full}/kernel/extra/shredder-kernel.ko%{kmod_suffix} %endif @@ -875,6 +882,9 @@ User Mode Linux (UML) kernel modules %ksob_mk_module_pkg -n 8821ce -s net/wireless -r rtl8821ce-blacklist %ksob_mk_module_pkg -n 8821cu -s net/wireless +%ifarch %{ix86} %{x86_64} +%ksob_mk_module_pkg -n wl -s net/wireless -r broadcom-wl-aliases +%endif %ksob_mk_module_pkg -n xt_TRIPSO -s net -r tripso %ksob_mk_module_pkg -n xt_so -s net -r ipt-so @@ -1248,6 +1258,16 @@ cp 8821cu.ko %{temp_modules}/%{kver_full}/kernel/net/wireless/8821cu.ko popd rm -fr kernel-source-rtl8821cu +%ifarch %{ix86} %{x86_64} +cp -r "$(rpm -q --qf '/usr/src/broadcom-wl-%%{VERSION}-%%{RELEASE}' kernel-source-broadcom-wl)" kernel-source-broadcom-wl +pushd kernel-source-broadcom-wl +%kmake -C %{src_dir} M="$PWD" +mkdir -p %{temp_modules}/%{kver_full}/kernel/net/wireless/ +cp wl.ko %{temp_modules}/%{kver_full}/kernel/net/wireless/wl.ko +popd +rm -fr kernel-source-broadcom-wl +%endif + cp -r "$(rpm -q --qf '/usr/src/tripso-%%{VERSION}-%%{RELEASE}' kernel-source-tripso)" kernel-source-tripso pushd kernel-source-tripso %kmake KDIR=%{src_dir}