diff options
| author |   Matsuu Takuto <matsuu@gentoo.org> | 2010-10-30 06:44:15 +0000 |
|---|---|---|
| committer | Matsuu Takuto <matsuu@gentoo.org> | 2010-10-30 06:44:15 +0000 |
| commit | c2216b97fd27b4b8f5ce4697b607fcc2082955a9 (patch) | |
| tree | dd7951da4ce7167cbaa7956f75c3cdce66fbfbfa /net-wireless | |
| parent | Use PyPI mirrors. Fix dependencies. (diff) | |
| download | gentoo-2-c2216b97fd27b4b8f5ce4697b607fcc2082955a9.tar.gz gentoo-2-c2216b97fd27b4b8f5ce4697b607fcc2082955a9.tar.bz2 gentoo-2-c2216b97fd27b4b8f5ce4697b607fcc2082955a9.zip | |
Fixed 2.6.34 issue, bug #343025.
(Portage version: 2.1.9.22/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless')
3 files changed, 87 insertions, 1 deletions
diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog index 1afbc614390b..2ac69a96ec26 100644 --- a/net-wireless/broadcom-sta/ChangeLog +++ b/net-wireless/broadcom-sta/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-wireless/broadcom-sta # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.26 2010/10/27 15:56:35 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.27 2010/10/30 06:44:15 matsuu Exp $ + +*broadcom-sta-5.60.246.2-r1 (30 Oct 2010) + + 30 Oct 2010; MATSUU Takuto <matsuu@gentoo.org> + +broadcom-sta-5.60.246.2-r1.ebuild, + +files/broadcom-sta-5.60.246.2-linux-2.6.34.patch: + Fixed 2.6.34 issue, bug #343025. *broadcom-sta-5.60.246.2 (27 Oct 2010) diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2-r1.ebuild new file mode 100644 index 000000000000..3ebe7600526d --- /dev/null +++ b/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2-r1.ebuild,v 1.1 2010/10/30 06:44:15 matsuu Exp $ + +EAPI="2" +inherit eutils linux-mod + +DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver." +HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php" +SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86-" +SRC_URI="x86? ( ${SRC_BASE}32_v${PV}.tar.gz ) + amd64? ( ${SRC_BASE}64_v${PV}.tar.gz )" + +LICENSE="Broadcom" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RESTRICT="mirror" + +DEPEND=">=virtual/linux-sources-2.6.22" +RDEPEND="" + +S="${WORKDIR}" + +MODULE_NAMES="wl(net/wireless)" +MODULESD_WL_ALIASES=("wlan0 wl") + +PROPERTIES="interactive" + +pkg_setup() { + check_license + + # bug #300570 + # NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled + # make checks non-fatal. The correct fix is blackisting ssb and, perhaps + # b43 via udev rules. Moreover, previous fix broke binpkgs support. + CONFIG_CHECK="~!B43 ~!SSB" + if kernel_is ge 2 6 33; then + CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT CFG80211_WEXT WEXT_PRIV ~!MAC80211" + ERROR_WEXT_PRIV="Starting with 2.6.33, it is not possible to set WEXT_PRIV directly. We recommend to set another symbol selecting WEXT_PRIV, for example, PRISM54, IPW2200 and so on. See Bug #248450 comment#98." + elif kernel_is ge 2 6 31; then + CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211" + elif kernel_is ge 2 6 29; then + CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211 COMPAT_NET_DEV_OPS" + else + CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP" + fi + linux-mod_pkg_setup + + BUILD_PARAMS="-C ${KV_DIR} M=${S}" + BUILD_TARGETS="wl.ko" +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \ + "${FILESDIR}/${P}-gcc.patch" \ + "${FILESDIR}/${P}-linux-2.6.34.patch" +} diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch new file mode 100644 index 000000000000..9ac6b9ec9e8f --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch @@ -0,0 +1,21 @@ +diff -Naur broadcom-sta-5.60.246.2.orig/src/wl/sys/wl_linux.c broadcom-sta-5.60.246.2/src/wl/sys/wl_linux.c +--- broadcom-sta-5.60.246.2.orig/src/wl/sys/wl_linux.c 2010-10-01 03:53:22.000000000 +0900 ++++ broadcom-sta-5.60.246.2/src/wl/sys/wl_linux.c 2010-10-30 15:29:48.000000000 +0900 +@@ -1415,7 +1415,7 @@ + static void + _wl_set_multicast_list(struct net_device *dev) + { +-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 33) ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34) + struct dev_mc_list *mclist; + #else + struct netdev_hw_addr *ha; +@@ -1435,7 +1435,7 @@ + if (wl->pub->up) { + wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE; + +-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 33) ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34) + for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count); + i++, mclist = mclist->next) { + if (i >= MAXMULTILIST) { |