Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2629.git;a=commitdiff;h=18641e2f861754efd8ae545014103faf216a7584
commit 18641e2f861754efd8ae545014103faf216a7584 Author: Miklos Vajna <vmik...@frugalware.org> Date: Mon Apr 13 13:11:36 2009 +0200 wlan-ng-0.2.9-13-i686 - disable building of kernel modules as they are in-tree now diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild index a5be5fc..387f4ba 100644 --- a/source/network-extra/wlan-ng/FrugalBuild +++ b/source/network-extra/wlan-ng/FrugalBuild @@ -3,21 +3,23 @@ pkgname=wlan-ng pkgver=0.2.9 -pkgrel=12 +pkgrel=13 pkgdesc="Wireless Lan modules" url="http://www.linux-wlan.org/"; + Finclude kernel-module -depends=(${depen...@]} 'bash') +depends=('kernel>=2.6.29' 'bash') +makedepends=('kernel-source') +unset install + groups=('network-extra') archs=('i686' 'x86_64') backup=(etc/wlan/wlan.conf) up2date="lynx -dump ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/|grep tar.bz2$|sed -n 's/.*g-\(.*\)\.t.*/\1/;s/-//;$ p'" source=(ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-$pkgname-$pkgver.tar.bz2 \ - rc.wlan kernel-2.6.2{6,7}.patch) + rc.wlan) sha1sums=('e6b8e37bbe3b6d2d17dea5d8db782cad7f84a64e' \ - 'b5b76089293cf11ab5c5f634f1c3b8dd7f4c34a7' \ - '6c7b50d0d57edcb6d018292ddfe72304a555bb42' \ - '49b6c496aba2223b59c1850000057f2c6e326547') + 'b5b76089293cf11ab5c5f634f1c3b8dd7f4c34a7') build() { @@ -33,12 +35,23 @@ build() Fsed "PRISM2_PCMCIA=y" "PRISM2_PCMCIA=n" config.in Fpatchall make auto_config - make all || return 1 - make install - Fmv /usr/local/man /usr/man + dirs="mkmeta nwepgen prism2/download wlancfg wlanctl" + cd src + for i in $dirs + do + cd $i + Fmessage "Building $i" + make || return 1 + cd - >/dev/null + done + for i in $dirs ../etc + do + cd $i + make install || return 1 + cd - >/dev/null + done Frm /init.d Frcd wlan - Fbuild_kernelmod_scriptlet } # optimization OK diff --git a/source/network-extra/wlan-ng/kernel-2.6.26.patch b/source/network-extra/wlan-ng/kernel-2.6.26.patch deleted file mode 100644 index ec306f0..0000000 --- a/source/network-extra/wlan-ng/kernel-2.6.26.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: src/p80211/p80211netdev.c -=================================================================== ---- src/p80211/p80211netdev.c (revision 1865) -+++ src/p80211/p80211netdev.c (working copy) -@@ -947,7 +947,9 @@ - #endif - #endif - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) ) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ) -+ dev_net_set(dev, &init_net); -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) ) - dev->nd_net = &init_net; - #endif \ No newline at end of file diff --git a/source/network-extra/wlan-ng/kernel-2.6.27.patch b/source/network-extra/wlan-ng/kernel-2.6.27.patch deleted file mode 100644 index 76690c9..0000000 --- a/source/network-extra/wlan-ng/kernel-2.6.27.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- src/p80211/p80211wext.c -+++ src/p80211/p80211wext.c -@@ -1424,7 +1424,8 @@ - * airo driver code. - */ - static char * --wext_translate_bss(char *current_ev, char *end_buf, p80211msg_dot11req_scan_results_t *bss) -+wext_translate_bss(struct iw_request_info *info, char *current_ev, -+ char *end_buf, p80211msg_dot11req_scan_results_t *bss) - { - struct iw_event iwe; /* Temporary buffer */ - -@@ -1432,7 +1433,7 @@ - memcpy(iwe.u.ap_addr.sa_data, bss->bssid.data.data, WLAN_BSSID_LEN); - iwe.u.ap_addr.sa_family = ARPHRD_ETHER; - iwe.cmd = SIOCGIWAP; -- current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN); -+ current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_ADDR_LEN); - - /* The following entries will be displayed in the same order we give them */ - -@@ -1448,7 +1449,7 @@ - iwe.u.data.length = size; - iwe.u.data.flags = 1; - iwe.cmd = SIOCGIWESSID; -- current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, &essid[0]); -+ current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, &essid[0]); - WLAN_LOG_DEBUG(1, " essid size OK.\n"); - } - -@@ -1467,7 +1468,7 @@ - } - iwe.cmd = SIOCGIWMODE; - if (iwe.u.mode) -- current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_UINT_LEN); -+ current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_UINT_LEN); - - /* Encryption capability */ - if (bss->privacy.data == P80211ENUM_truth_true) -@@ -1476,13 +1477,13 @@ - iwe.u.data.flags = IW_ENCODE_DISABLED; - iwe.u.data.length = 0; - iwe.cmd = SIOCGIWENCODE; -- current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, NULL); -+ current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, NULL); - - /* Add frequency. (short) bss->channel is the frequency in MHz */ - iwe.u.freq.m = bss->dschannel.data; - iwe.u.freq.e = 0; - iwe.cmd = SIOCGIWFREQ; -- current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_FREQ_LEN); -+ current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_FREQ_LEN); - - /* Add quality statistics */ - iwe.u.qual.level = bss->signal.data; -@@ -1490,7 +1491,7 @@ - /* do a simple SNR for quality */ - iwe.u.qual.qual = qual_as_percent(bss->signal.data - bss->noise.data); - iwe.cmd = IWEVQUAL; -- current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); -+ current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); - - return current_ev; - } -@@ -1525,7 +1526,7 @@ - break; - } - -- current_ev = wext_translate_bss(current_ev, extra + IW_SCAN_MAX_DATA, &msg); -+ current_ev = wext_translate_bss(info, current_ev, extra + IW_SCAN_MAX_DATA, &msg); - scan_good = 1; - i++; - } while (i < IW_MAX_AP); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
