diff options
| author |   Saleem Abdulrasool <compnerd@gentoo.org> | 2007-07-12 03:04:42 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@gentoo.org> | 2007-07-12 03:04:42 +0000 |
| commit | 18c65c8343e5b8bb74e93a5a1d1b3fe840ee8e79 (patch) | |
| tree | c001f71115d4023bd5a794df3dbb373bc79f3280 | |
| parent | punt debug code #185007 (diff) | |
| download | gentoo-2-18c65c8343e5b8bb74e93a5a1d1b3fe840ee8e79.tar.gz gentoo-2-18c65c8343e5b8bb74e93a5a1d1b3fe840ee8e79.tar.bz2 gentoo-2-18c65c8343e5b8bb74e93a5a1d1b3fe840ee8e79.zip | |
merge updates from bug #184947
(Portage version: 2.1.3_rc7)
| -rw-r--r-- | net-wireless/iwlwifi/ChangeLog | 6 | ||||
| -rw-r--r-- | net-wireless/iwlwifi/iwlwifi-0.0.36.ebuild | 44 |
2 files changed, 43 insertions, 7 deletions
diff --git a/net-wireless/iwlwifi/ChangeLog b/net-wireless/iwlwifi/ChangeLog index a974b1daaa0b..c4300db49888 100644 --- a/net-wireless/iwlwifi/ChangeLog +++ b/net-wireless/iwlwifi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/iwlwifi # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwlwifi/ChangeLog,v 1.2 2007/07/11 03:32:18 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwlwifi/ChangeLog,v 1.3 2007/07/12 03:04:42 compnerd Exp $ + + 12 Jul 2007; Saleem Abdulrasool <compnerd@gentoo.org> + iwlwifi-0.0.36.ebuild: + Add fixes from bug #184947 11 Jul 2007; Saleem Abdulrasool <compnerd@gentoo.org> iwlwifi-0.0.36.ebuild: diff --git a/net-wireless/iwlwifi/iwlwifi-0.0.36.ebuild b/net-wireless/iwlwifi/iwlwifi-0.0.36.ebuild index 67a0838de721..604509a4a5c0 100644 --- a/net-wireless/iwlwifi/iwlwifi-0.0.36.ebuild +++ b/net-wireless/iwlwifi/iwlwifi-0.0.36.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwlwifi/iwlwifi-0.0.36.ebuild,v 1.2 2007/07/11 03:32:18 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwlwifi/iwlwifi-0.0.36.ebuild,v 1.3 2007/07/12 03:04:42 compnerd Exp $ -inherit linux-mod +inherit eutils linux-mod DESCRIPTION="Intel (R) PRO/Wireless 3945ABG Network Drivers" HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" @@ -11,15 +11,47 @@ SRC_URI="http://intellinuxwireless.org/${PN}/downloads/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="ipw3945 ipw4965" DEPEND=">=virtual/linux-sources-2.6.22" -RDEPEND="|| ( net-wireless/iwl3945-ucode net-wireless/iwl4965-ucode )" +RDEPEND="ipw3945? ( net-wireless/iwl3945-ucode ) + ipw4965? ( net-wireless/iwl4965-ucode ) + !ipw3945? ( !ipw4965? ( net-wireless/iwl3945-ucode net-wireless/iwl4965-ucode ) )" pkg_setup() { - linux-mod_pkg_setup + if kernel_is lt 2 6 22 ; then + eerror "iwlwifi requires a kernel >=2.6.22." + eerror "Please set your /usr/src/linux symlink accordingly." + die "invalid /usr/src/linux symlink" + else + CONFIG_CHECK="MAC80211" + fi BUILD_TARGETS="all" - MODULE_NAMES="iwl3945(net/wireless:${S}/compatible) iwl4965(net/wireless:${S}/compatible)" BUILD_PARAMS="KSRC=${KV_DIR} M=${S}" + + linux-mod_pkg_setup + + if use ipw3945 ; then + MODULE_NAMES="iwl3945(net/wireless:${S}/compatible)" + + if ! use ipw4965 ; then + BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IWL4965=n" + fi + + fi + + if use ipw4965 ; then + MODULE_NAMES="${MODULE_NAMES} iwl4965(net/wireless:${S}/compatible)" + + if ! use ipw3945 ; then + BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IWL3945=n" + fi + fi + + if ! use ipw3945 && ! use ipw4965 ; then + einfo "Wireless card not selected, building all modules" + MODULE_NAMES="iwl3945(net/wireless:${S}/compatible) iwl4965(net/wireless:${S}/compatible)" + BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IWL3945=m CONFIG_IWL4965=m" + fi } |