Author: nvieville Update of /cvs/nonfree/rpms/broadcom-wl/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22401 Modified Files: broadcom-wl.spec Added Files: 20-wl.conf api fedora.readme Log Message: * Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.112-3 - Added /etc/dracut.conf.d/20-wl.conf to workaround #2526 - Added /etc/akmods/akmod-wl/api to workaround #2548 #2562 - fedora.readme added to explain usage of the above --- NEW FILE 20-wl.conf --- ## /etc/dracut.conf.d/20-wl.conf file ## ## Explanation: ## ## Use only with Broadcom STA wireless driver provided by RPMFusion ## broadcom-wl, akmod-wl and kmod-wl packages. ## Provides required modules in order to avoid kernel 3.6.X panic at ## boot time on certain platforms such as HP Pavilion dm1 Notebook PC. ## See https://bugzilla.rpmfusion.org/show_bug.cgi?id=2526#c29 for an ## example of possible issues. ## To be able to boot the failing kernel, one should add wl.disable=1 ## to the grub boot command. ## ## Usage: ## ## - Uncomment the line beginning with "add_drivers+=" below to add the ## required module to your current and future kernels. Then Rebuild ## the current kernel initramfs file by typing "dracut" in a root ## console. ## ## - Comment the line beginning with "add_drivers+=" below to remove the ## required module of your current and future kernels. Then Rebuild ## the current kernel initramfs file by typing "dracut" in a root ## console. ## ## Caution: ## ## Consider to rebuild your initramfs file every time it is needed. ## ## See http://people.redhat.com/harald/dracut.html#id489921 and ## http://people.redhat.com/harald/dracut.html#dracutconf5 for ## complete explanations on using dracut. ## ## State: ## ## Disabled by default ## #add_drivers+="lib80211 lib80211_crypt_tkip wl" --- NEW FILE api --- #API=WEXT --- NEW FILE fedora.readme --- This file provides some basic information about Broadcom STA wireless driver configuration files on Fedora with RPMFusion packages. ------------------------------------------------------------------------ Version 0.1 - Tue Nov 06 2012 - initial release ------------------------------------------------------------------------ 0. Cautions =========== The files mentioned in this document should not be used in a wireless operational system. Only failing wireless system should give a try to this file proposed solutions. Use them at your own risk and only if your system could not boot properly or if your Broadcom wireless device doesn't work correctly. 1. Choosing between WEXT or CFG80211 API ======================================== Some configurations require the user to choose between the WEXT API or CFG80211 API in order to get Broadcom STA wireless driver properly loaded, and correctly usable by third-party softwares. Since this driver cannot be configured on-the-fly, the only solution is to use RPMFusion akmod-wl package only and set the /etc/akmods/akmod-wl/api file correctly. No RPMFusion kmod-wl package installed will take care of the settings provided in the /etc/akmods/akmod-wl/api file, and using this file requires an exclusive usage of the akmod-wl package. /etc/akmods/akmod-wl/api file should contain only one line depending on the API choosen: API=WEXT to force building the module with WEXT API or API=CFG80211 to force building the module with CFG80211 API or #API=WEXT or #API=CFG80211 to let the Broadcom included Makefile do the right choice according to your current kernel version. #API=WEXT is the default setting. Once this file modified, one should rebuild current kmod-wl package for the current kernel by typing this command: akmods --force --kernel `uname -r` --akmod wl Reboot should be needed in order to get last wl module correctly loaded. Caution : --------- WEXT API will be dropped from future kernels according to https://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commi... This workaround should only used on compatibles kernels with the WEXT API. One should considere to switch to higher wireless compatible Fedora Release in order to get the most recent CFG80211 API with most recent kernel. This workaround will be dropped from the future broadcom-wl, kmod-wl and akmod-wl packages when the WEXT API will be dropped too. 2. Initramfs configuration file usage ===================================== Please read comments in /etc/dracut.conf.d/20-wl.conf file in order to configure loading modules needed by the Broadcom STA wireless driver in kernel's init ramdisks. Edit the /etc/dracut.conf.d/20-wl.conf file and comment/uncomment the one line "add_drivers+=" directive depending on your choice. For example # nano /etc/dracut.conf.d/20-wl.conf or # sudo nano /etc/dracut.conf.d/20-wl.conf should let you to modify this file, ctrl+o would save the file, and ctrl+x should quit nano. Then use dracut command to rebuild your current kernel initramfs file. See http://people.redhat.com/harald/dracut.html#id489921 and http://people.redhat.com/harald/dracut.html#dracutconf5 for complete explanations on using dracut. 3. Support ========== Support only about these configuration files will be provided on: https://bugzilla.rpmfusion.org/enter_bug.cgi?product=Fedora Index: broadcom-wl.spec =================================================================== RCS file: /cvs/nonfree/rpms/broadcom-wl/F-17/broadcom-wl.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- broadcom-wl.spec 23 Apr 2012 14:20:35 -0000 1.19 +++ broadcom-wl.spec 21 Nov 2012 12:05:09 -0000 1.20 @@ -1,6 +1,6 @@ Name: broadcom-wl Version: 5.100.82.112 -Release: 2%{?dist}.1 +Release: 3%{?dist} Summary: Common files for Broadcom 802.11 STA driver Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -9,6 +9,9 @@ Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11... Source2: http://www.broadcom.com/docs/linux_sta/README.txt Source3: broadcom-wl-blacklist.conf +Source4: 20-wl.conf +Source5: api +Source6: fedora.readme Patch0: broadcom-wl-5.100.82.112-license.patch BuildArch: noarch @@ -29,7 +32,8 @@ iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt sed -i 's/\r$//' lib/LICENSE.txt cp -p %{SOURCE2} . -chmod 644 lib/LICENSE.txt README.txt +cp -p %{SOURCE6} . +chmod 644 lib/LICENSE.txt README.txt fedora.readme %patch0 -p1 -b .license %build @@ -37,18 +41,29 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/ -install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/ +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/ +install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/ +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/ +install -p -m0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/ +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/ +install -p -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc lib/LICENSE.txt README.txt +%doc lib/LICENSE.txt README.txt fedora.readme %config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf +%config(noreplace) %{_sysconfdir}/dracut.conf.d/20-wl.conf +%config(noreplace) %{_sysconfdir}/akmods/akmod-wl/api %changelog +* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.112-3 +- Added /etc/dracut.conf.d/20-wl.conf to workaround #2526 +- Added /etc/akmods/akmod-wl/api to workaround #2548 #2562 +- fedora.readme added to explain usage of the above + * Mon Apr 23 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.112-2.1 - Rebuilt with correct cvs tag number to allow upgrade from F-16