diff options
author | Matsuu Takuto <matsuu@gentoo.org> | 2010-01-16 02:49:05 +0000 |
---|---|---|
committer | Matsuu Takuto <matsuu@gentoo.org> | 2010-01-16 02:49:05 +0000 |
commit | 12d9f66600f63d74634b8b5e6f4e59bc6d41f237 (patch) | |
tree | 48089220820b88853701bf8803901fb5d06dbd6a /net-wireless | |
parent | Add prefix keywords (diff) | |
download | historical-12d9f66600f63d74634b8b5e6f4e59bc6d41f237.tar.gz historical-12d9f66600f63d74634b8b5e6f4e59bc6d41f237.tar.bz2 historical-12d9f66600f63d74634b8b5e6f4e59bc6d41f237.zip |
changed CONFIG_CHECK from ~!SSB ~!B43 to !SSB !B43, bug #300570. 2.6.33 support.
Package-Manager: portage-2.1.7.16/cvs/Linux x86_64
Diffstat (limited to 'net-wireless')
4 files changed, 81 insertions, 3 deletions
diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog index 157a1c6f77e9..3084903c3842 100644 --- a/net-wireless/broadcom-sta/ChangeLog +++ b/net-wireless/broadcom-sta/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-wireless/broadcom-sta -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.17 2009/12/07 15:47:15 matsuu Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.18 2010/01/16 02:49:05 matsuu Exp $ + +*broadcom-sta-5.10.91.9.3-r3 (16 Jan 2010) + + 16 Jan 2010; MATSUU Takuto <matsuu@gentoo.org> + +broadcom-sta-5.10.91.9.3-r3.ebuild, + +files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch: + changed CONFIG_CHECK from ~!SSB ~!B43 to !SSB !B43, bug #300570. 2.6.33 + support. *broadcom-sta-5.10.91.9.3-r2 (07 Dec 2009) diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest index 7cfa67a5982b..cd6c3137dca4 100644 --- a/net-wireless/broadcom-sta/Manifest +++ b/net-wireless/broadcom-sta/Manifest @@ -1,8 +1,10 @@ AUX broadcom-sta-5.10.91.9-license.patch 716 RMD160 f4af0c36ec10d5fd4500af94c3864f6a352883e0 SHA1 0f2458882656dbf73035e566e53b902bc22c37f4 SHA256 53544703c15eb5e7f35721c436bfd0acf7db3de1df83b2e344bfc7090cb14cf1 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 DIST hybrid-portsrc-x86_32-v5.10.91.9.3.tar.gz 604412 RMD160 928b33c6ddc16d7479caef5b90f8cbbd8f0d8cc1 SHA1 80b413d810cbb3dbc8e2e7dfff9364656d042198 SHA256 b3c5a6bea957414ee69118d7917b5c04364f84318a0b045740e3707412e6a343 DIST hybrid-portsrc-x86_64-v5.10.91.9.3.tar.gz 601391 RMD160 9c5e014daabad654ae725e55850fa165976acf41 SHA1 a426712617bf3f1c03a0012e087a4735b527c53c SHA256 2cc313f7ecf8fc7efeb8e5c4023ecf9b63dbd318e3f1b1fcb1c81c2c98429e8c EBUILD broadcom-sta-5.10.91.9.3-r1.ebuild 1275 RMD160 dced23e556ada3793b9793c8f74df95e2823e33e SHA1 fbd7ed59f78872f83e24d41f19dfc7826ee87d1d SHA256 6913b8ce2e8e0b4d6a5b24a5efccbccd425aaf8de7f30ed5102a2c1d5a4e3017 EBUILD broadcom-sta-5.10.91.9.3-r2.ebuild 1317 RMD160 513da42cf2eb99471d17e35de0db3a360a200f08 SHA1 f2cce24de78545d4f00e93c1e2580702019bd45c SHA256 7377d7fd1df31ca322b761a86238c0c1cd11baa6d42f2e1e824ba07032484e5d -MISC ChangeLog 4903 RMD160 d6e82e9f1e28cc764d7087c73dc69d9c7e6c16cd SHA1 29e173b141857e5d2431a21d55721ba350f95eaa SHA256 2b0398c61317552b32e6cbd26ec88a1c7cb4eed3734264b72b7c392c13e34224 +EBUILD broadcom-sta-5.10.91.9.3-r3.ebuild 1621 RMD160 b40c20084c7cda5c11e9596343c927ada2bcb309 SHA1 ddeafd56081f6274b756ed3a7991ba1e6d62498d SHA256 ac59a2096c123df29497e69d3dcde5d6978332eb3db903a41763afb6c664bd49 +MISC ChangeLog 5175 RMD160 bdcfb1bd271893dd8a4e2927925fded1d29ce6f7 SHA1 413fe89918bbe1641f6055cd6833cbe842682f9e SHA256 c81dc545df9b2d51b46bed8147b3546b5d6eb7f359e4a1f1719e30e85c910b6a MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371 diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r3.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r3.ebuild new file mode 100644 index 000000000000..7893458653d9 --- /dev/null +++ b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r3.ebuild @@ -0,0 +1,56 @@ +# 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.10.91.9.3-r3.ebuild,v 1.1 2010/01/16 02:49:05 matsuu Exp $ + +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="${DEPEND}" + +S="${WORKDIR}" + +MODULE_NAMES="wl(net/wireless)" +MODULESD_WL_ALIASES=("wlan0 wl") + +PROPERTIES="interactive" + +pkg_setup() { + check_license + + # bug #300570 + CONFIG_CHECK="!B43 !SSB" + if kernel_is ge 2 6 33; then + #CONFIG_CHECK="${CONFIG_CHECK} LIB80211 CFG80211_WEXT WEXT_PRIV ~!MAC80211" + CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT CFG80211_WEXT WEXT_PRIV ~!MAC80211" + 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_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \ + "${FILESDIR}/${P}-linux-2.6.32.patch" \ + "${FILESDIR}/${P}-linux-2.6.33.patch" +} diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch new file mode 100644 index 000000000000..54b114171203 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch @@ -0,0 +1,12 @@ +diff -Naur broadcom-sta-5.10.91.9.3.orig/src/include/linuxver.h broadcom-sta-5.10.91.9.3/src/include/linuxver.h +--- broadcom-sta-5.10.91.9.3.orig/src/include/linuxver.h 2009-09-16 07:25:27.000000000 +0900 ++++ broadcom-sta-5.10.91.9.3/src/include/linuxver.h 2010-01-16 08:20:12.000000000 +0900 +@@ -19,6 +19,8 @@ + #include <linux/version.h> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)) + #include <linux/config.h> ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) ++#include <generated/autoconf.h> + #else + #include <linux/autoconf.h> + #endif |