summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2007-05-20 17:51:25 +0000
committerChristian Heim <phreak@gentoo.org>2007-05-20 17:51:25 +0000
commit4ce4aa310b817453fe1b4510c6ce313f9400cc93 (patch)
treee7377dc3ae73054504c0e08e3b2596859b4e5e2c /net-wireless
parentStable on ppc wrt bug 178320 (diff)
downloadgentoo-2-4ce4aa310b817453fe1b4510c6ce313f9400cc93.tar.gz
gentoo-2-4ce4aa310b817453fe1b4510c6ce313f9400cc93.tar.bz2
gentoo-2-4ce4aa310b817453fe1b4510c6ce313f9400cc93.zip
Make ipw3945-1.2.1 aware of the changed CONFIG options of Linux 2.6.22 (thanks to Momsen Reincke <mreincke at gmx.net> in #179028).
(Portage version: 2.1.2.7)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/ipw3945/ChangeLog6
-rw-r--r--net-wireless/ipw3945/ipw3945-1.2.1.ebuild10
2 files changed, 12 insertions, 4 deletions
diff --git a/net-wireless/ipw3945/ChangeLog b/net-wireless/ipw3945/ChangeLog
index 1d3ec50f896c..909df3a06721 100644
--- a/net-wireless/ipw3945/ChangeLog
+++ b/net-wireless/ipw3945/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/ipw3945
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.27 2007/05/20 17:14:17 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.28 2007/05/20 17:51:25 phreak Exp $
+
+ 20 May 2007; Christian Heim <phreak@gentoo.org> ipw3945-1.2.1.ebuild:
+ Make ipw3945-1.2.1 aware of the changed CONFIG options of Linux 2.6.22
+ (thanks to Momsen Reincke <mreincke at gmx.net> in #179028).
*ipw3945-1.2.1 (20 May 2007)
diff --git a/net-wireless/ipw3945/ipw3945-1.2.1.ebuild b/net-wireless/ipw3945/ipw3945-1.2.1.ebuild
index d2ffebda5adf..3a8800c35d98 100644
--- a/net-wireless/ipw3945/ipw3945-1.2.1.ebuild
+++ b/net-wireless/ipw3945/ipw3945-1.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.2.1.ebuild,v 1.1 2007/05/20 17:14:17 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.2.1.ebuild,v 1.2 2007/05/20 17:51:25 phreak Exp $
inherit linux-mod eutils
@@ -26,8 +26,6 @@ MODULE_NAMES="ipw3945(net/wireless:)"
MODULESD_IPW3945_DOCS="README.ipw3945"
KV_OBJ="ko"
-CONFIG_CHECK="NET_RADIO FW_LOADER IEEE80211 IEEE80211_CRYPT_CCMP IEEE80211_CRYPT_TKIP"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
ERROR_IEEE80211="${P} requires support for Generic IEEE 802.11 Networking Stack (CONFIG_IEEE80211)."
@@ -38,6 +36,12 @@ pkg_setup() {
if kernel_is lt 2 6 18; then
die "${P} needs a kernel >=2.6.18! Please set your KERNEL_DIR or /usr/src/linux suitably"
+ elif kernel_is ge 2 6 22 ; then
+ CONFIG_CHECK="WLAN_80211 FW_LOADER IEEE80211 IEEE80211_CRYPT_CCMP IEEE80211_CRYPT_TKIP"
+ ERROR_WLAN_80211="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_WLAN_80211)."
+ else
+ CONFIG_CHECK="NET_RADIO FW_LOADER IEEE80211 IEEE80211_CRYPT_CCMP IEEE80211_CRYPT_TKIP"
+ ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
fi
linux-mod_pkg_setup