SPECS: iwlwifi.spec - pldized
zbyniu
zbyniu at pld-linux.org
Wed Oct 17 12:57:06 CEST 2007
Author: zbyniu Date: Wed Oct 17 10:57:06 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- pldized
---- Files affected:
SPECS:
iwlwifi.spec (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SPECS/iwlwifi.spec
diff -u SPECS/iwlwifi.spec:1.4 SPECS/iwlwifi.spec:1.5
--- SPECS/iwlwifi.spec:1.4 Sun Oct 14 20:56:12 2007
+++ SPECS/iwlwifi.spec Wed Oct 17 12:57:01 2007
@@ -1,10 +1,10 @@
# $Revision$, $Date$
# Conditional build:
%bcond_without dist_kernel # allow non-distribution kernel
+%bcond_without kernel # don't build kernel modules
%bcond_with verbose # verbose build (V=1)
#
%define _rel 0.3
-%define _mod_suffix current
Summary: Intel® Wireless WiFi Link 4965AGN and Intel® PRO/Wireless 3945ABG Network Connection
Name: iwlwifi
Version: 1.1.17
@@ -59,14 +59,15 @@
%prep
%setup -q
+sed -i -e 's#$(CONFIG_IWL3945)#m#g' -e 's#$(CONFIG_IWL4965)#m#g' origin/Makefile
%build
-%build_kernel_modules -m iwl3945,iwl4965 -p SHELL=/bin/bash
+%build_kernel_modules -C origin -m iwl3945,iwl4965
%install
rm -rf $RPM_BUILD_ROOT
-%install_kernel_modules -s %{_mod_suffix} -n iwl3945 -m iwl3945 -d misc
-%install_kernel_modules -s %{_mod_suffix} -n iwl4965 -m iwl4965 -d misc
+%install_kernel_modules -m origin/iwl3945 -d drivers/net/wireless
+%install_kernel_modules -m origin/iwl4965 -d drivers/net/wireless
%clean
rm -rf $RPM_BUILD_ROOT
@@ -85,12 +86,12 @@
%files -n kernel%{_alt_kernel}-net-iwl3945
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/iwl3945.ko*
+/lib/modules/%{_kernel_ver}/drivers/net/wireless/iwl3945.ko*
#%{_sysconfdir}/modprobe.d/%{_kernel_ver}/iwl3945.conf
%files -n kernel%{_alt_kernel}-net-iwl4965
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/iwl4965.ko*
+/lib/modules/%{_kernel_ver}/drivers/net/wireless/iwl4965.ko*
#%{_sysconfdir}/modprobe.d/%{_kernel_ver}/iwl4965.conf
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -99,6 +100,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2007/10/17 10:57:01 zbyniu
+- pldized
+
Revision 1.4 2007/10/14 18:56:12 blues
- don't build it twice
@@ -110,4 +114,3 @@
Revision 1.1 2007/10/13 20:43:00 blues
- initial, NFY
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/iwlwifi.spec?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list