Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=0cb3a487c53e2664d6314dec9460df64bd3dd89a

commit 0cb3a487c53e2664d6314dec9460df64bd3dd89a
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Mon Jan 10 22:40:18 2011 +0100

bcmwl-5.100.82.38-1-i686

- version bump
- add missing LICENSE

diff --git a/source/network-extra/bcmwl/FrugalBuild 
b/source/network-extra/bcmwl/FrugalBuild
index 9efbd89..4cc770e 100644
--- a/source/network-extra/bcmwl/FrugalBuild
+++ b/source/network-extra/bcmwl/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Miklos Vajna <vmik...@frugalware.org>

pkgname=bcmwl
-pkgver=5.60.48.36
-pkgrel=16
+pkgver=5.100.82.38
+pkgrel=1
pkgdesc="Broadcom 802.11 Linux STA wireless driver"
url="http://www.broadcom.com/support/802.11/linux_sta.php";
Finclude kernel-module
@@ -11,24 +11,24 @@ groups=('network-extra')
archs=('i686' 'x86_64')
if [ "$CARCH" == "i686" ]; then
_arch="x86_32"
-       sha1sums=('07d955afe599466b0e25bcc507186f5b50f1a171')
+       sha1sums=('3062830f86c5f1f41d8a4b26d6e0072dc989c7ba')
elif [ "$CARCH" == "x86_64" ]; then
_arch=$CARCH
-       sha1sums=('1174a4d3102aa0ed45003556e03842668ef698b9')
+       sha1sums=('6076de3bd8206b3e7b8bfc2eadbe3a97eec4e735')
fi
-_F_archive_name="hybrid-portsrc-x86_64-v"
+_F_archive_name="hybrid-portsrc_x86_64-v"
Fpkgversep=""
-up2date="Flasttar $url"
+up2date="Flasttar $url|sed 's/_/./g'"
_F_cd_path="."
-source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-$_arch-v$pkgver.tar.gz
 \
-       kernel-2.6.35.patch)
-sha1sums=(${sha1sums[@]} 'aea6c166a4ea45188527c2cfe8fd7bea9cc38bff')
+source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_$_arch-v${pkgver//./_}.tar.gz
 \
+       kernel-2.6.37.patch)
+sha1sums=(${sha1sums[@]} '76ae6e73966bd6d8a8ef87b63958f22c67ea1162')

build()
{
Fpatchall
-       Fsed '#include <linux/autoconf.h>' '#include <generated/autoconf.h>' 
src/include/linuxver.h
make -C /lib/modules/$_F_kernelmod_uname/build M=`pwd` || Fdie
Ffilerel /lib/modules/$_F_kernelmod_uname/kernel/drivers/net/wireless/wl.ko
+       Fdocrel lib/LICENSE.txt
Fbuild_kernelmod_scriptlet
}
diff --git a/source/network-extra/bcmwl/kernel-2.6.35.patch 
b/source/network-extra/bcmwl/kernel-2.6.35.patch
deleted file mode 100644
index 985b027..0000000
--- a/source/network-extra/bcmwl/kernel-2.6.35.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- x/src/wl/sys/wl_linux.c-   2010-06-08 10:26:17.320092425 +0100
-+++ x/src/wl/sys/wl_linux.c    2010-06-08 10:42:16.824567775 +0100
-@@ -1416,7 +1416,7 @@
- _wl_set_multicast_list(struct net_device *dev)
- {
-       wl_info_t *wl;
--      struct dev_mc_list *mclist;
-+      struct netdev_hw_addr *ha;
-       int i;
-
-       if (!dev)
-@@ -1430,14 +1430,15 @@
-       if (wl->pub->up) {
-               wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE;
-
--              for (i = 0, mclist = dev->mc_list; mclist && (i < 
dev->mc_count);
--                      i++, mclist = mclist->next) {
-+              i = 0;
-+              netdev_for_each_mc_addr(ha, dev) {
-                       if (i >= MAXMULTILIST) {
-                               wl->pub->allmulti = TRUE;
-                               i = 0;
-                               break;
-                       }
--                      wl->pub->multicast[i] = *((struct ether_addr*) 
mclist->dmi_addr);
-+                      wl->pub->multicast[i] = *((struct ether_addr*)ha->addr);
-+                      i++;
-               }
-               wl->pub->nmulticast = i;
-               wlc_set(wl->wlc, WLC_SET_PROMISC, (dev->flags & IFF_PROMISC));
diff --git a/source/network-extra/bcmwl/kernel-2.6.37.patch 
b/source/network-extra/bcmwl/kernel-2.6.37.patch
new file mode 100644
index 0000000..38cbe05
--- /dev/null
+++ b/source/network-extra/bcmwl/kernel-2.6.37.patch
@@ -0,0 +1,32 @@
+From 9dab8884095e0710d62c41c45191a85d0dae59b3 Mon Sep 17 00:00:00 2001
+From: Henrik Rydberg <rydb...@euromail.se>
+Date: Sun, 9 Jan 2011 19:47:43 +0100
+Subject: [PATCH] Make up for the missing init_MUTEX
+
+The init_MUTEX is a wrapper for sema_init(), and has been
+deprecated and removed in 2.6.37. In order for the dkms
+package to work also for earlier kernel versions, simply
+define the wrapper if it is missing.
+
+Signed-off-by: Henrik Rydberg <rydb...@euromail.se>
+---
+ src/src/wl/sys/wl_linux.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/src/wl/sys/wl_linux.c b/src/src/wl/sys/wl_linux.c
+index c11678f..6f4b7a6 100644
+--- a/src.orig/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -99,6 +99,10 @@ static void wl_dpc_rxwork(struct wl_task *task);
+
+ #endif
+
++#ifndef init_MUTEX
++#define init_MUTEX(sem) sema_init(sem, 1)
++#endif
++
+ static int wl_linux_watchdog(void *ctx);
+ static
+ int wl_found = 0;
+--
+1.7.2.3
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to