From 6a1d8ebd0661cabe36f7f3ca4fb0ba269049c052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BB=D0=BE=D1=85=D0=B8=D0=BD=20=D0=AE=D1=80=D0=B8?= =?UTF-8?q?=D0=B9?= Date: Tue, 19 Mar 2013 12:21:03 +0400 Subject: [PATCH] Changed net-wireless/broadcom-sta ebuilds and patches --- net-wireless/broadcom-sta/Manifest | 12 ++- .../broadcom-sta-5.100.82.112-r9.ebuild | 60 +++++++++++++ .../broadcom-sta-6.20.155.1.ebuild | 88 ------------------- .../broadcom-sta-5.10.91.9-license.patch | 12 +++ .../broadcom-sta-5.100.82.111-linux-3.0.patch | 21 +++++ ...oadcom-sta-5.100.82.112-linux-2.6.39.patch | 11 +++ .../broadcom-sta-5.100.82.112-linux-3.2.patch | 13 +++ .../broadcom-sta-5.100.82.112-linux-3.8.patch | 1 - .../files/broadcom-sta-5.100.82.38-gcc.patch | 11 +++ .../net-wireless/.calculate_directory | 1 - .../broadcom-sta/.calculate_directory | 1 - 11 files changed, 137 insertions(+), 94 deletions(-) create mode 100644 net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r9.ebuild delete mode 100644 net-wireless/broadcom-sta/broadcom-sta-6.20.155.1.ebuild create mode 100644 net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-license.patch create mode 100644 net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch create mode 100644 net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-2.6.39.patch create mode 100644 net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.2.patch rename {profiles/templates/3.1/6_ac_install_patch/net-wireless/broadcom-sta => net-wireless/broadcom-sta/files}/broadcom-sta-5.100.82.112-linux-3.8.patch (99%) create mode 100644 net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-gcc.patch delete mode 100644 profiles/templates/3.1/6_ac_install_patch/net-wireless/.calculate_directory delete mode 100644 profiles/templates/3.1/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest index b66a61179..89162aff7 100644 --- a/net-wireless/broadcom-sta/Manifest +++ b/net-wireless/broadcom-sta/Manifest @@ -1,3 +1,9 @@ -DIST bcmwl-kernel-source_6.20.155.1%2Bbdcom-0ubuntu6_amd64.deb 1345530 SHA256 f9b012f122f725d989b61184bfa7499f542eaa7cd0414a683e02932e6ba82235 SHA512 49683bf83a5b4f02194a4d51e6f018400f620b81dcfdb14a607b60d80aa628ce6e772009477eb094d048cc53200b6c65f3fb4554f46310a00975f0d67f6c1d8c WHIRLPOOL 0c604303a988a4af85574ca5cddab7199759ba6d40c821fa9d63c5ab40b191966bd7b146e8d9767afc71dc820fa7038c6d6de9138243beb35ec07b18a8c94baf -DIST bcmwl-kernel-source_6.20.155.1%2Bbdcom-0ubuntu6_i386.deb 1303434 SHA256 501e34c3807b53bde3dace456c4139c2c2043252408679e8002cc6ab57677eb8 SHA512 ea2837f05868c0deed20ab87a079115da7b3be613906939762e5ceb1d0586473bd009e4c1d2efbd50b4ec4e45c0713d2754cedfe7b3ce92cd67382f9f6879103 WHIRLPOOL 37931a7d3c8dde8fe5b45f2ad082acca0dbe30b17467aea10baf045b78a71a12c08addd9eefe1b4b50fb69478eefc51f4372baa5835a92f0b4bf774082d9a40a -EBUILD broadcom-sta-6.20.155.1.ebuild 2643 SHA256 3c1167ed247a6d7d0f2cd1a33355d17534ebfb4508a980104e6407accf2b8e20 SHA512 3de26183a22517c0a0fc0ecd7d9a21adeff3c2f0fdfe3df516373f5e08e02164a38cdd8aa939486a6556b8a6e7f7cb0b2d22e048fcf720a90957939f08dbdb4d WHIRLPOOL 31caa5a625e3228cfadc8e55ee8ad4023ff0646959861d3b430fae49ea590f11c70596050dc5dedfdc441c633b0063262f431ab215b5dc7b6afb6f7a759f58c6 +AUX broadcom-sta-5.10.91.9-license.patch 716 SHA256 53544703c15eb5e7f35721c436bfd0acf7db3de1df83b2e344bfc7090cb14cf1 SHA512 abdea6d154e66f43fd629eefe3dfd19a43318acfc54b3ac52abd9c8e839d25971214971b14429f5fb09091fbb16793d2ce3db1093c2ccca9496975085156b94c WHIRLPOOL 98ec882b0b0db93e5a19bc7aa465c7c758f3c36bd3fa5159458520b4d1a298549c5072a46f50d351dc48cfb01216b11a164291539f72455d37caad593d61483a +AUX broadcom-sta-5.100.82.111-linux-3.0.patch 935 SHA256 cd349fef72bb33025e59105fefa69c3e60066985707f396e03235102ca938137 SHA512 00e3139158b53f80d03bb6aa5b4eb3435cc453b100ee57b638a138ae0b624c88946c63dc20d559f05bee451275d7662dfb8c29e68de11ebe04c8df87a6a86f70 WHIRLPOOL 84d0d41e8a3e2b0b248ffe5d4c5256c68e1533aa58049a34ffc98e5f0bd0a2a20cffd58adf20cdced79096d10134bec474af5f9666a225c2103dfffc93b030a8 +AUX broadcom-sta-5.100.82.112-linux-2.6.39.patch 564 SHA256 2df2f242d6b34118cecbb8fb5c209356bf095436e8b553705f9f9f022648b53d SHA512 5b69b3b41af0a2f090b3fb021c188a846207b59ba0baf324cf4c93a5d3f9105fcd8f7e0aee592ebe0e898dd39c1988c65c8adeba643f1899f35287b0362b043e WHIRLPOOL 3d7dc0e31422b960038d52f5c62e15d1f0980dabb304cfc8cecc897af985a4ddcfaa90fb98150c25b2bc8040bb76c5c3e0b2afe8b7871397fbd20ed4a60debad +AUX broadcom-sta-5.100.82.112-linux-3.2.patch 541 SHA256 65e89b0950fe3972c3212c970d307f1b4ef633dfd622f94f4b5b816cb70af430 SHA512 e0d47ba584b302a3f6cf5da084d734cea44970a76e094bcc18acec07936ad77d7a69ef39c9333eef09256d0f7477d4d153b76e7378544ab40671c5aa1c7eedff WHIRLPOOL d681d691c4ca305dca3bee7501e831c9b64fe2912b5b91a3fc86c1d40606896c2cb479806eeb69a779905495f41a1513e75d0a4503b722459d1577559eb8ce35 +AUX broadcom-sta-5.100.82.112-linux-3.8.patch 4267 SHA256 a3d53a4868e5cde314ef06b108a88c6136ad36b3894a7732871c59561a4d69ad SHA512 1731a7e44fbd9d1aa4af9c2f7320f27797fe6a646c0c7528c648bd2b4e7c7960c690f8c5d7774fab55cc91fbd9c6f42896d437034960422d143f222ed4858d55 WHIRLPOOL bc58dec2f60e6b9efd7c8e462da6865bb75f0bc6e2eed11190d88d22edda8eb8d55f4b2198e1a5eb10d54889a58b35ea42f7e6750beadc7d965841cd18405104 +AUX broadcom-sta-5.100.82.38-gcc.patch 417 SHA256 82ad7a047e8e384fe4a571e054fabb0f629c81012f035f3525fa51eb611cc736 SHA512 d271493861fedf937be6f534fab1eaec95e7db3324583bfafb52445d1a5001c07d596fac88b150c7bd83e02d0095ad2867dc2f0ffbcfb320f4536d557d4a663e WHIRLPOOL 32b270e795503b5cb97c2407b472b62a93efffb14f2147680f45ad063839aa59526baadc72e9eeab424f1d36f236fd0e1bc40ae7ea9477d0dc2c043445fa7fc7 +DIST hybrid-portsrc_x86_32-v5_100_82_112.tar.gz 1139221 SHA256 85b4e3163b383943d5002a571efbd03f212d010ba0962ebdefb201fe6ce270e7 SHA512 315f8b2bb146de8868a64f08c839b0136ed174c76d0f4e825a4b8c0e0109872ccc58ff3103bb86ae4277f273060a6e1ed41d7aeb84931c926f8b3b0b085ac355 WHIRLPOOL 8b80660932e9d8db3b186e3847729d433ea899876577aa7c7f1f962efb4798b350630dcadbe2d18ec9f1faa232e42d23e9b306b221913ce61aae7a8e9dffb5da +DIST hybrid-portsrc_x86_64-v5_100_82_112.tar.gz 1175410 SHA256 9cd32f164c748b4353f10a74f3b00640bb281e4b79f17114aac581e0b3cd4ae3 SHA512 485c4a661c30ebc076499f48d468ef30afdd5fdfd6458f4cd25fceaf15969f33e46695a173908d05e635a572efc152b5ae973493d53d5b4089335b03b0ba9a6d WHIRLPOOL 2e3259d3fde1830aeddf8ee38a070f891c0acb167bfe99d623b6102f1bc8ee8f3f776efc6370b1067063eea2069a93e5678e6ea3b3ab054e7d4d30b9f5db8f46 +EBUILD broadcom-sta-5.100.82.112-r9.ebuild 2037 SHA256 8517e705d0773fce3679b158d19402aa950d5087f8febf6613c150d9afa66d22 SHA512 346827956907c8ca1cd8e0ca92dde4223d8f5b15dff2ce396074c71634eed06df45caf549a5b40398243975208b1056cbaf3c7b049325705e3058ae6bd9a9d2c WHIRLPOOL 0f2f37e3cd0cc0f71c475a1b567f4e6910d2ae8fa9dbac7640a0a422d45c8d12f997aaece8a7cb36cbf9af22dd9e22cc1be22c181a3b1fb2248b129040c980cf diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r9.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r9.ebuild new file mode 100644 index 000000000..d47b3f97d --- /dev/null +++ b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r9.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2013 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.112-r2.ebuild,v 1.5 2013/03/08 04:59:30 pinkbyte Exp $ + +EAPI="4" +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" +RDEPEND="" + +S="${WORKDIR}" + +MODULE_NAMES="wl(net/wireless)" +MODULESD_WL_ALIASES=("wlan0 wl") + +pkg_setup() { + # bug #300570 + # NOTE: 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 32; then + CONFIG_CHECK="${CONFIG_CHECK} CFG80211 LIB80211 ~!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_prepare() { + epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \ + "${FILESDIR}/${PN}-5.100.82.38-gcc.patch" \ + "${FILESDIR}/${PN}-5.100.82.111-linux-3.0.patch" \ + "${FILESDIR}/${PN}-5.100.82.112-linux-2.6.39.patch" \ + "${FILESDIR}/${PN}-5.100.82.112-linux-3.2.patch" \ + "${FILESDIR}/${PN}-5.100.82.112-linux-3.8.patch" + sed -e "s:^#include $:#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)\\n\\0\\n#endif:" \ + -i src/wl/sys/wl_linux.c || die "sed failed to patch for linux-3.4" + + epatch_user +} diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.20.155.1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.20.155.1.ebuild deleted file mode 100644 index ef5b390ad..000000000 --- a/net-wireless/broadcom-sta/broadcom-sta-6.20.155.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2012 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.112-r2.ebuild,v 1.4 2012/05/22 02:55:18 zmedico Exp $ - -EAPI="4" -inherit eutils linux-mod - -DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver." -HOMEPAGE="https://launchpad.net/ubuntu/+source/bcmwl http://www.broadcom.com/support/802.11/linux_sta.php" -SRC_BASE="https://launchpad.net/ubuntu/+archive/primary/+files/bcmwl-kernel-source_" -SRC_URI="x86? ( ${SRC_BASE}${PV}%2Bbdcom-0ubuntu6_i386.deb ) - amd64? ( ${SRC_BASE}${PV}%2Bbdcom-0ubuntu6_amd64.deb )" - -LICENSE="Broadcom" -KEYWORDS="amd64 x86" -IUSE="" - -RESTRICT="mirror" - -DEPEND="virtual/linux-sources" -RDEPEND="" - -S="${WORKDIR}" - -MODULE_NAMES="wl(net/wireless)" -MODULESD_WL_ALIASES=("wlan0 wl") - -pkg_setup() { - # bug #300570 - # NOTE: 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 32; then - CONFIG_CHECK="${CONFIG_CHECK} CFG80211 LIB80211 ~!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" - KBASE="/lib/modules/${KV_FULL}" - export KBASE -} - -src_unpack() { - if use x86 - then ar x "${DISTDIR}/bcmwl-kernel-source_${PV}%2Bbdcom-0ubuntu6_i386.deb" || \ - die "first extract failed" - elif use amd64 - then ar x "${DISTDIR}/bcmwl-kernel-source_${PV}%2Bbdcom-0ubuntu6_amd64.deb" || \ - die "first extract failed" - else die "don't know what to extract?" - fi - tar xzf "${WORKDIR}/data.tar.gz" || die "second extract failed" -} - -src_prepare() { - cd "${WORKDIR}/usr/src/bcmwl-${PV}+bdcom" - for i in `ls patches/*.patch` - do epatch ${i} - done - sed -e "s/dpkg --print-architecture),amd64/uname -m),x86_64/" \ - -e "s#\(\$(MDEST_DIR)\)#"${WORKDIR}"/image/\1#" \ - -i Makefile \ - || die "sed in Makefile failed" -} - -src_compile() { - cd "${WORKDIR}/usr/src/bcmwl-${PV}+bdcom" - if use x86 - then emake ARCH="i386" - elif use amd64 - then emake ARCH="x86_64" - fi -} - -src_install() { - cd "${WORKDIR}/usr/src/bcmwl-${PV}+bdcom" - dodir /lib/modules/${KV_FULL}/kernel/drivers/net/wireless - insinto /lib/modules/${KV_FULL}/kernel/drivers/net/wireless - doins wl.ko -} diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-license.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-license.patch new file mode 100644 index 000000000..b320d977e --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-license.patch @@ -0,0 +1,12 @@ +diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c +--- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 02:48:59.000000000 +0900 ++++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c 2009-05-08 00:48:20.000000000 +0900 +@@ -163,6 +163,8 @@ + static void wl_free_if(wl_info_t *wl, wl_if_t *wlif); + static void wl_get_driver_info(struct net_device *dev, struct ethtool_drvinfo *info); + ++MODULE_LICENSE("MIXED/Proprietary"); ++ + static struct pci_device_id wl_id_table[] = { + { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch new file mode 100644 index 000000000..a915aee67 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch @@ -0,0 +1,21 @@ +diff -Naur broadcom-sta-5.100.82.111.orig/Makefile broadcom-sta-5.100.82.111/Makefile +--- broadcom-sta-5.100.82.111.orig/Makefile 2011-10-06 08:16:10.000000000 +0900 ++++ broadcom-sta-5.100.82.111/Makefile 2011-10-24 08:54:26.000000000 +0900 +@@ -16,7 +16,7 @@ + ifneq ($(KERNELRELEASE),) + + LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \ +- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "32" ]; then \ ++ if [ "$(VERSION)" -ge "3" -o "$(VERSION)" -eq "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "32" ]; then \ + echo TRUE; \ + else \ + echo FALSE; \ +@@ -24,7 +24,7 @@ + )) + + LINUXVER_WEXT_ONLY:=$(strip $(shell \ +- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "17" ]; then \ ++ if [ "$(VERSION)" -ge "3" -o "$(VERSION)" -eq "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "17" ]; then \ + echo FALSE; \ + else \ + echo TRUE; \ diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-2.6.39.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-2.6.39.patch new file mode 100644 index 000000000..633b9c858 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-2.6.39.patch @@ -0,0 +1,11 @@ +--- src/wl/sys/wl_cfg80211.c.orig 2011-10-31 07:57:38.000000000 -0400 ++++ src/wl/sys/wl_cfg80211.c 2011-10-31 07:57:46.000000000 -0400 +@@ -1811,7 +1811,7 @@ + notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, u.beacon.variable) + + wl_get_ielen(wl); + freq = ieee80211_channel_to_frequency(notif_bss_info->channel +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) + ,(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ + #endif + ); diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.2.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.2.patch new file mode 100644 index 000000000..b491537cb --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.2.patch @@ -0,0 +1,13 @@ +diff -Naur broadcom-sta-5.100.82.112.orig/src/wl/sys/wl_linux.c broadcom-sta-5.100.82.112/src/wl/sys/wl_linux.c +--- broadcom-sta-5.100.82.112.orig/src/wl/sys/wl_linux.c 2011-10-23 01:56:55.000000000 +0900 ++++ broadcom-sta-5.100.82.112/src/wl/sys/wl_linux.c 2011-11-22 00:56:07.021520421 +0900 +@@ -385,7 +385,9 @@ + #endif + .ndo_get_stats = wl_get_stats, + .ndo_set_mac_address = wl_set_mac_address, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) + .ndo_set_multicast_list = wl_set_multicast_list, ++#endif + .ndo_do_ioctl = wl_ioctl + }; + diff --git a/profiles/templates/3.1/6_ac_install_patch/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-linux-3.8.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.8.patch similarity index 99% rename from profiles/templates/3.1/6_ac_install_patch/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-linux-3.8.patch rename to net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.8.patch index 044b7cea4..b313609b5 100644 --- a/profiles/templates/3.1/6_ac_install_patch/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-linux-3.8.patch +++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.8.patch @@ -1,4 +1,3 @@ -# Calculate format=diff diff -ur broadcom-sta-5.100.82.112.orig/src/wl/sys/wl_cfg80211.c broadcom-sta-5.100.82.112/src/wl/sys/wl_cfg80211.c --- broadcom-sta-5.100.82.112.orig/src/wl/sys/wl_cfg80211.c 2013-02-25 23:56:44.171538633 +0400 +++ broadcom-sta-5.100.82.112/src/wl/sys/wl_cfg80211.c 2013-03-01 11:24:52.932161199 +0400 diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-gcc.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-gcc.patch new file mode 100644 index 000000000..048565376 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-gcc.patch @@ -0,0 +1,11 @@ +diff -Naur broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h +--- broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h 2010-10-08 07:32:59.000000000 +0900 ++++ broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h 2010-10-28 00:50:57.925351964 +0900 +@@ -15,6 +15,7 @@ + #ifndef _wl_iw_h_ + #define _wl_iw_h_ + ++#include + #include + + #include diff --git a/profiles/templates/3.1/6_ac_install_patch/net-wireless/.calculate_directory b/profiles/templates/3.1/6_ac_install_patch/net-wireless/.calculate_directory deleted file mode 100644 index 720d52e47..000000000 --- a/profiles/templates/3.1/6_ac_install_patch/net-wireless/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/3.1/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory b/profiles/templates/3.1/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory deleted file mode 100644 index 615bc8bdf..000000000 --- a/profiles/templates/3.1/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge()!=