>=virtual/linux-sources-2.6.37 support, bug #350196.

Package-Manager: portage-2.1.9.26/cvs/Linux x86_64

4 files changed, 98 insertions, 16 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index 409423c31a2b..bddec29742ab 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.29 2010/12/30 15:29:55 matsuu Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.30 2011/01/01 15:28:28 matsuu Exp $
+
+*broadcom-sta-5.100.82.38-r1 (01 Jan 2011)
+
+  01 Jan 2011; MATSUU Takuto <matsuu@gentoo.org>
+  +broadcom-sta-5.100.82.38-r1.ebuild,
+  +files/broadcom-sta-5.100.82.38-linux-2.6.37.patch:
+  Support >=virtual/linux-sources-2.6.37, bug #350196.
 
 *broadcom-sta-5.100.82.38 (30 Dec 2010)
 
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 0ec03ee8fb5b..430770ed6e42 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -5,6 +5,7 @@ AUX broadcom-sta-5.10.91.9-license.patch 716 RMD160 f4af0c36ec10d5fd4500af94c386
 AUX broadcom-sta-5.10.91.9.3-linux-2.6.32.patch 576 RMD160 17d1f0e2ea7e507bc7c7522f7dee8d667c04c131 SHA1 3b13b5d10b199da0590f7b9fed6694e23369596d SHA256 55ef2c1f7be8414b2df89d9f118affa9650c94e95491ad7f9c112f06debdf5d6
 AUX broadcom-sta-5.10.91.9.3-linux-2.6.33.patch 551 RMD160 2e0385d005127de53d040df3a079a6facff6eb2e SHA1 3aad38866d5e5239f0b12c891db4372d679ed57b SHA256 08b2b9e401118be918e02634707120cf926677e7ae6fabc69158eb8b7a8cbfb2
 AUX broadcom-sta-5.100.82.38-gcc.patch 417 RMD160 aa1b67ace50a513d0ed1d04e14b21afb8cba51da SHA1 1c0095b3b4a79f3d036719f7c7a38d7e889c9ea1 SHA256 82ad7a047e8e384fe4a571e054fabb0f629c81012f035f3525fa51eb611cc736
+AUX broadcom-sta-5.100.82.38-linux-2.6.37.patch 530 RMD160 e8f4612fc6d48d32603a7168a07dd62713e90614 SHA1 bc044b663f69f8eb8886a5886213031212be144c SHA256 a1b75ee09bb2a372a5d35c0309042abc6b47cfbaf18a413e5171926696f882e8
 AUX broadcom-sta-5.60.246.2-gcc.patch 417 RMD160 aa1b67ace50a513d0ed1d04e14b21afb8cba51da SHA1 1c0095b3b4a79f3d036719f7c7a38d7e889c9ea1 SHA256 82ad7a047e8e384fe4a571e054fabb0f629c81012f035f3525fa51eb611cc736
 AUX broadcom-sta-5.60.246.2-linux-2.6.34.patch 889 RMD160 c3ac4c5e5a4511c2a6774180c90041d4809ecd80 SHA1 e19d3bf4734882053ab273db5c3babfb814463d9 SHA256 e8ce64fee738e1aeae08320b788d2e6547d5efcbfc0833c2eb129f8eee0da3d2
 AUX broadcom-sta-5.60.48.36-linux-2.6.35.patch 1670 RMD160 66ed871880630e65e509af96586646589b8f0c08 SHA1 6173cb1442ba0cda520082bdb79ba7089b2e4538 SHA256 4ec98dc9395c117d5dbe0f0cb5ce2add82f2cf1892c833d79689889596b5152e
@@ -16,26 +17,27 @@ DIST hybrid-portsrc_x86-64_v5.60.246.2.tar.gz 884707 RMD160 1d9eb5060b979eed8033
 DIST hybrid-portsrc_x86-64_v5.60.246.6.tar.gz 884531 RMD160 762f6eb4154a55fd1892184898dfc031eb199f73 SHA1 b4ecb6f82fe0f943d40fb85ef7c34eb16fe0abf2 SHA256 d41d60d5d0968d2a695227f276ea2a939f9a77622e8607067a2a4a75dd290a7d
 DIST hybrid-portsrc_x86_32-v5_100_82_38.tar.gz 1195817 RMD160 020c3b76aa50e1f911288b28e656a0524620311a SHA1 3062830f86c5f1f41d8a4b26d6e0072dc989c7ba SHA256 f736af1da2fa05fb65d8e919b3eb0116eb5ef47e4acc14f5a2adc4bac1b4fb37
 DIST hybrid-portsrc_x86_64-v5_100_82_38.tar.gz 1150253 RMD160 5f1937e997446de015c49f1ced1bc7864cb07791 SHA1 6076de3bd8206b3e7b8bfc2eadbe3a97eec4e735 SHA256 1c165b26a9d736d07c0912577134414d8742242521f313e3830afb44524d35a7
+EBUILD broadcom-sta-5.100.82.38-r1.ebuild 1979 RMD160 2376d6be2f91d62423b0ac8ba63f45cb5292eeae SHA1 3f8b8ec1a21f2bcd2c7981df787b366ac611b4ae SHA256 454db77d6802d1f515901ee3a222a887b43c4d1638bee877175325e89d48ce28
 EBUILD broadcom-sta-5.100.82.38.ebuild 1921 RMD160 d82134d0bd4b7166542cffe30ce5e26c22d9035e SHA1 526299a75f095fc996edd91542b47e2ff4e6492f SHA256 ff1c7f730ceae3722d06a750f1333abf5a7298b47b25bc4593366e89a0febfd0
 EBUILD broadcom-sta-5.60.246.2-r1.ebuild 1940 RMD160 248f0685ddb001d48b7f151676825cc8f927584a SHA1 33e12a802f6670efb9ee905313fb4c6725ad4952 SHA256 98de3494ad7d8da8a889df9623215f348dc6c7b22bc09b66b456e52ceceedbcd
 EBUILD broadcom-sta-5.60.246.6.ebuild 1907 RMD160 03442259c9774358419cde4080f012ec72f95eab SHA1 9abb77d2ac56ce82edffb9012a368dae0b2e79a4 SHA256 310e456d98e9fdca0ff6c404768bec9c8da56f84eb88de129a19afbd97a91448
 EBUILD broadcom-sta-5.60.48.36-r1.ebuild 1962 RMD160 bb6f8aaf40a5ccced29ed1f3bc5106ec746259be SHA1 2a43c85478c8a900cb18a3c3d6a3c4186ab521d6 SHA256 d33bf6854ad57e4363d5359d3420569b5e998eba9107c3b6f3f4eaf53cdf750d
-MISC ChangeLog 7533 RMD160 c78b38c58b28fffc09cea054b6d7fc8bd90e08df SHA1 bef77141a88baf957626f951b6c5fc6492a42073 SHA256 630dc227167984b76983dc7179fb0d4cdc8ce280b7835edf51e4d87f595625e6
+MISC ChangeLog 7775 RMD160 ca2a7d3f2d5c083c10618e175996bf5705b0fce9 SHA1 a034b049323de83b2aacae69e6e1ae8b9713a14e SHA256 67783df79105cf0ee6e2c414799b31aec9148ae24e94e5d04dfdc57d9de86da4
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNHKV/AAoJECaGw+YFKA1pQZsQAJ+tcb1Y572HvteBODpTqnGW
-4dMvNLdXd0KVJwE6dI10pW+h+EPerHI/RK4BhQkltrF/L3eCyLwZIkFgQurthaWD
-qKgEtOUIomWfAF8JzoAOCF1DPtHBHG4MKyrf13fuiepF4FDL4XTe3fsbUUcDe1cp
-ajrF/yCJzhvHtqZ4SGABbbB93g29bOrO3LUq4dCx6fEturKBuGKeIJMRgHfTQIQC
-uJDNgvZYKU3MKZu1RVjDpMbhW5Zf0w+pBnCryfEremzmLJpYwlZJWbTTUM+2wogU
-uDNBhGPsZ40agnhV558VChmOP7hKkaN8fZuZouV8D9VuiVON038mfvhwIvnKqmqp
-1iX0cXoHs4mzE903OQe4XO7Oz4O5dJTs/XdyVYPcpGMFcgi62RTypxCAdEKrjmZp
-AuiOhQhfchn+MoXnulYVY0I94k8C0/VZOXkWWscBMx+yIy8qwbz9zPnZahjAEj7o
-BZEYnAzUqUZN9L/yH5ZX4Dyd6wOKAymbFQ1rSgs7GmOOfBGw6LahbWy3k5aJkJsc
-0b/Tti6lxexgrbrPTFL7ggKSY28LzHSajM3l0BTbw+1/TMI6vitQWHQF2rs+O9WA
-Vl/bWwOuQ0NvNKKb0xibpbJzoNJheu17BanEYqCMqq0uI8KV8XGxwJ6au5oYoOE3
-VdLynSO9vNR5A0Xd+oO3
-=5xxP
+iQIcBAEBAgAGBQJNH0gqAAoJECaGw+YFKA1p7pUP/3B8U98s8wB7n0ThBrvDdLxn
+H2YtaZk2SsYO2J5VJcE+nomLKkxudcRLT/EcsR5zstmX8KG36mzqu/snjHMm79fa
+cbqriZpRLZtPoQgGuAV3RSG3k2isJ5ZelTXwDOkesCZ66Lsy8yCjVnW7uiTKPHG5
+nqJFC8M041STNdajNd9TGghncEyJ47ApogKTt/h7Y69f5J3JmA+ppHrYEZGvCrdf
+Po35SRQwQFtGrSCF8/gaAxSIx9jIymwprvrp7C0wjm1Joi7bkXI+gSvARiToa642
+rPvtXiK1FrzpIFzZrdlTCLiDts3aLH/SoPuAMTc3L+uVrmkRqi8Zwc5tNTgj/W53
+zPSUrUIcYujcSBsJ4U86musxO3r7ejfEe8UEPMtsLBCsyJKj0IhJUU9UE55k0DC0
+/gg+YceGjTFH3mOTrT69Itc2/rAtJfsDhb21fbxQf9DXzoudLX36qxPjz1KmUJ74
+3/v7u7qckJQOqbIEeYOoaTBW73FvYczrcpXWQCJHtlw7rghoX4jNz8i0flIRY45Y
+8xC4EueplLTdYaGY22/1MdnaMFoXcxWNjVakUhr8xW83qmd825E903QBv92jze0d
+4tU2+fsDppQGZNE2kQ8vFAQF7AHmkGMOyQ2a+E3r37jf5vUEhBZJOz98n3iwCccJ
+Q1+43/1X7sLuybaXZGVn
+=SIb2
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild
new file mode 100644
index 000000000000..b2f9e92b8c21
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 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.100.82.38-r1.ebuild,v 1.1 2011/01/01 15:28:28 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}/${PN}-5.100.82.38-gcc.patch" \
+		"${FILESDIR}/${PN}-5.100.82.38-linux-2.6.37.patch"
+}
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-linux-2.6.37.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-linux-2.6.37.patch
new file mode 100644
index 000000000000..ae57a20874e8
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-linux-2.6.37.patch
@@ -0,0 +1,15 @@
+diff -Naur broadcom-sta.orig/src/wl/sys/wl_linux.c broadcom-sta/src/wl/sys/wl_linux.c
+--- broadcom-sta.orig/src/wl/sys/wl_linux.c	2010-12-15 11:01:09.000000000 +0900
++++ broadcom-sta/src/wl/sys/wl_linux.c	2011-01-02 00:18:32.438095116 +0900
+@@ -482,7 +482,11 @@
+ #ifdef WL_ALL_PASSIVE
+ 		spin_lock_init(&wl->txq_lock);
+ #endif 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++		sema_init(&wl->sem, 1);
++#else
+ 		init_MUTEX(&wl->sem);
++#endif
+ 	}
+ 
+ 	if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode,