X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=madwifi.spec;h=8c339bbb5e490a07e87ffaa1837537f35a92e17f;hb=bc9c90f4bf4c9828dd995449a927152c109a14bc;hp=81a01d69e4d9bc9d2b8b9590115145fcaa2a1f82;hpb=1a82d3419246b0131b89d5c1425fd4dd339f5cee;p=madwifi.git diff --git a/madwifi.spec b/madwifi.spec index 81a01d6..8c339bb 100644 --- a/madwifi.spec +++ b/madwifi.spec @@ -1,24 +1,34 @@ # -# madwifi spec file -# -# RPM spec file +# $Id$ # +%define url $URL$ + # Marc E. Fiuczynski # Copyright (C) 2006 The Trustees of Princeton University # License is GPL. -# -# $Id$ -# # kernel_release, kernel_version and kernel_arch are expected to be set by the build to e.g. # kernel_release : vs2.3.0.29.1.planetlab # kernel_version : 2.6.22.14 %define name madwifi -%define version 0.9.3 -%define subversion 3 +%define version 4132 +%define taglevel 0 + +%define actual_name %{name}-trunk-r%{version}-20100921 -%define release %{subversion}%{kernel_release}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} + +# guess which convention is used; k27 and before used dash, k32 uses dot +%define kernelpath_dash /usr/src/kernels/%{kernel_version}-%{kernel_release}-%{kernel_arch} +%define kernelpath_dot /usr/src/kernels/%{kernel_version}-%{kernel_release}.%{kernel_arch} +%define kernelpath %( [ -d %{kernelpath_dot} ] && echo %{kernelpath_dot} || echo %{kernelpath_dash} ) + +# the k32 kernel currently builds e.g. /lib/modules/2.6.32-0.onelab.2010.12.07-i686 +# the k27 and before does not have the -i686 part +%define kernel_id_old %{kernel_version}-%{kernel_release} +%define kernel_id_new %{kernel_version}-%{kernel_release}-%{_target_cpu} +%define kernel_id %( [ -d %{kernelpath_dot} ] && echo %{kernel_id_new} || echo %{kernel_id_old} ) Summary: madwifi Atheros driver Name: %{name} @@ -26,13 +36,14 @@ Version: %{version} Release: %{release} License: GPL Group: System Environment/Kernel -Source0: %{name}-%{version}.%{subversion}.tar.bz2 +Source0: %{actual_name}.tar.gz +Source1: ifup-pre-local BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Vendor: MadWifi Packager: PlanetLab -Distribution: PlanetLab 4.2 -URL: http://sourceforge.net/projects/madwifi/ +Distribution: PlanetLab %{plrelease} +URL: %(echo %{url} | cut -d ' ' -f 2) Requires: coreutils @@ -40,64 +51,68 @@ Requires: coreutils madwifi is a new generation driver for the Atheros chipset %prep -%setup +%setup -n %{actual_name} %build rm -rf $RPM_BUILD_ROOT -# with the new build, we use the kernel-devel rpm for building -kernel_fullname=%{kernel_version}-%{kernel_release}-%{kernel_arch} -linux=/usr/src/kernels/$kernel_fullname - -%__make KERNELPATH=$linux clean -%__make KERNELPATH=$linux -echo 'r' | %__make KERNELPATH=$linux DESTDIR=$RPM_BUILD_ROOT install +%__make KERNELPATH=%kernelpath clean +%__make KERNELPATH=%kernelpath %install +rm -fr $RPM_BUILD_ROOT + +echo 'r' | %__make KERNELPATH=%kernelpath BINDIR=/sbin MANDIR=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install +install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/ifup-pre-local + # Remove depmod files, will be regenerated in %post -rm -f $RPM_BUILD_ROOT/lib/modules/*/modules.* +rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/modules.* %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%dir /lib/modules/* -/lib/modules/*/net/ath_hal.ko -/lib/modules/*/net/ath_pci.ko -/lib/modules/*/net/ath_rate_sample.ko -/lib/modules/*/net/ath_rate_amrr.ko -/lib/modules/*/net/ath_rate_onoe.ko -/lib/modules/*/net/wlan.ko -/lib/modules/*/net/wlan_acl.ko -/lib/modules/*/net/wlan_ccmp.ko -/lib/modules/*/net/wlan_scan_ap.ko -/lib/modules/*/net/wlan_scan_sta.ko -/lib/modules/*/net/wlan_tkip.ko -/lib/modules/*/net/wlan_wep.ko -/lib/modules/*/net/wlan_xauth.ko -/usr/local/bin/80211debug -/usr/local/bin/80211stats -/usr/local/bin/athchans -/usr/local/bin/athctrl -/usr/local/bin/athdebug -/usr/local/bin/athkey -/usr/local/bin/athstats -/usr/local/bin/wlanconfig -/usr/local/man/man8/80211debug.8 -/usr/local/man/man8/80211stats.8 -/usr/local/man/man8/athchans.8 -/usr/local/man/man8/athctrl.8 -/usr/local/man/man8/athdebug.8 -/usr/local/man/man8/athkey.8 -/usr/local/man/man8/athstats.8 -/usr/local/man/man8/wlanconfig.8 +%dir /lib/modules/%{kernel_id} +/lib/modules/%{kernel_id}/net/ath_hal.ko +/lib/modules/%{kernel_id}/net/ath_pci.ko +/lib/modules/%{kernel_id}/net/ath_rate_sample.ko +/lib/modules/%{kernel_id}/net/ath_rate_amrr.ko +/lib/modules/%{kernel_id}/net/ath_rate_onoe.ko +/lib/modules/%{kernel_id}/net/wlan.ko +/lib/modules/%{kernel_id}/net/wlan_acl.ko +/lib/modules/%{kernel_id}/net/wlan_ccmp.ko +/lib/modules/%{kernel_id}/net/wlan_scan_ap.ko +/lib/modules/%{kernel_id}/net/wlan_scan_sta.ko +/lib/modules/%{kernel_id}/net/wlan_tkip.ko +/lib/modules/%{kernel_id}/net/wlan_wep.ko +/lib/modules/%{kernel_id}/net/wlan_xauth.ko +/lib/modules/%{kernel_id}/net/ath_rate_minstrel.ko +/sbin/80211debug +/sbin/80211stats +/sbin/athchans +/sbin/athctrl +/sbin/athdebug +/sbin/athkey +/sbin/athstats +/sbin/wlanconfig +/sbin/ath_info +/sbin/ifup-pre-local +/sbin/madwifi-unload +/sbin/wpakey +%{_mandir}/man8/80211debug.8* +%{_mandir}/man8/80211stats.8* +%{_mandir}/man8/athchans.8* +%{_mandir}/man8/athctrl.8* +%{_mandir}/man8/athdebug.8* +%{_mandir}/man8/athkey.8* +%{_mandir}/man8/athstats.8* +%{_mandir}/man8/wlanconfig.8* +%{_mandir}/man8/ath_info.8* %post -for version in /lib/modules/* ; do - depmod -a $(basename $version) >/dev/null 2>&1 || : -done +depmod -a %{kernel_id} >/dev/null 2>&1 || : # ask for a reboot @@ -106,18 +121,19 @@ done %postun # 0 = erase, 1 = upgrade if [ $1 -eq 0 ] ; then - for dir in /lib/modules/* ; do - version=$(basename $dir) - # If we were the only module installed, remove the module dependencies - if [ ! -d $dir/kernel ] ; then - [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove $version - else - depmod -a $version >/dev/null 2>&1 || : - fi - done + dir=/lib/modules/%{kernel_id} + # If we were the only module installed, remove the module dependencies + if [ ! -d $dir/kernel ] ; then + [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove %{kernel_id} + else + depmod -a %{kernel_id} >/dev/null 2>&1 || : + fi fi %changelog +* Thu Oct 02 2008 Thierry Parmentelat - madwifi-0.9.4-2 +- specfile adjustments for 0.9.4 + * Tue Dec 04 2007 Thierry Parmentelat - updated to build against kernel-devel