diff options
| -rw-r--r-- | network/broadcom-sta/README | 3 | ||||
| -rw-r--r-- | network/broadcom-sta/broadcom-sta-5.60.48.36-linux-2.6.33.patch | 12 | ||||
| -rw-r--r-- | network/broadcom-sta/broadcom-sta.SlackBuild | 28 | ||||
| -rw-r--r-- | network/broadcom-sta/broadcom-sta.info | 12 | ||||
| -rw-r--r-- | network/broadcom-sta/doinst.sh | 2 |
5 files changed, 20 insertions, 37 deletions
diff --git a/network/broadcom-sta/README b/network/broadcom-sta/README index 593784d0ecae..c1d035064289 100644 --- a/network/broadcom-sta/README +++ b/network/broadcom-sta/README @@ -3,5 +3,4 @@ the Broadcom-provided proprietary kernel driver that supports a number of their cards. Known supported model numbers include the BCM4311, BCM4312, BCM4321, and BCM4322 chipsets. -Read the included LICENSE.txt file (placed in /usr/doc) before using the -driver. +Read the included LICENSE.txt file (placed in /usr/doc) before using this. diff --git a/network/broadcom-sta/broadcom-sta-5.60.48.36-linux-2.6.33.patch b/network/broadcom-sta/broadcom-sta-5.60.48.36-linux-2.6.33.patch deleted file mode 100644 index a11ac3a709b3..000000000000 --- a/network/broadcom-sta/broadcom-sta-5.60.48.36-linux-2.6.33.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur broadcom-sta-5.60.48.36.orig/src/include/linuxver.h broadcom-sta-5.60.48.36/src/include/linuxver.h ---- broadcom-sta-5.60.48.36.orig/src/include/linuxver.h 2009-09-16 07:25:26.00000000 +0900 -+++ broadcom-sta-5.60.48.36/src/include/linuxver.h 2009-09-16 07:25:26.00000000 +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 diff --git a/network/broadcom-sta/broadcom-sta.SlackBuild b/network/broadcom-sta/broadcom-sta.SlackBuild index ebd229032a4a..f9fc7e57d984 100644 --- a/network/broadcom-sta/broadcom-sta.SlackBuild +++ b/network/broadcom-sta/broadcom-sta.SlackBuild @@ -4,36 +4,32 @@ # Public domain. PRGNAM=broadcom-sta -VERSION=5.60.246.2 +VERSION=5.100.82.38 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} KERNEL=${KERNEL:-$(uname -r)} - PKG_VERSION=${VERSION}_$(echo $KERNEL | tr - _) -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi +case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; +esac CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -WORKDIR=$TMP/build-$PRGNAM PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +WORKDIR=$TMP/build-$PRGNAM + # Skipped the usual set of variables since they don't apply here # (libdir isn't needed, and custom CFLAGS aren't wanted). if [ "$ARCH" = "i486" ]; then - MY_ARCH="x86-32" -elif [ "$ARCH" = "i686" ]; then - MY_ARCH="x86-32" + MY_ARCH="x86_32" elif [ "$ARCH" = "x86_64" ]; then - MY_ARCH="x86-64" + MY_ARCH="x86_64" else printf "\n\n$ARCH is not supported...\n" exit 1 @@ -44,7 +40,7 @@ set -e rm -rf $WORKDIR $PKG mkdir -p $TMP $WORKDIR $PKG $OUTPUT cd $WORKDIR -tar xvf $CWD/hybrid-portsrc_${MY_ARCH}_v${VERSION}.tar.gz +tar xvf $CWD/hybrid-portsrc_${MY_ARCH}-v$(printf $VERSION|tr . _).tar.gz # Build the module make -C /lib/modules/$KERNEL/build M=$WORKDIR clean @@ -60,7 +56,7 @@ cat $WORKDIR/lib/LICENSE.txt > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE.txt mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG chown -R root:root . diff --git a/network/broadcom-sta/broadcom-sta.info b/network/broadcom-sta/broadcom-sta.info index a3d60fff2e49..46277ca04e95 100644 --- a/network/broadcom-sta/broadcom-sta.info +++ b/network/broadcom-sta/broadcom-sta.info @@ -1,10 +1,10 @@ PRGNAM="broadcom-sta" -VERSION="5.60.246.2" +VERSION="5.100.82.38" HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php" -DOWNLOAD="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86-32_v5.60.246.2.tar.gz" -MD5SUM="079553e98d22e3e435367c070bf56a18" -DOWNLOAD_x86_64="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86-64_v5.60.246.2.tar.gz" -MD5SUM_x86_64="742d73baaedbdfeb3f5dd87814e1b745" +DOWNLOAD="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v5_100_82_38.tar.gz" +MD5SUM="c0074a1622c75916442e26763ddf47d0" +DOWNLOAD_x86_64="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_38.tar.gz" +MD5SUM_x86_64="cac172f7422fa43264049c7065fe21d6" MAINTAINER="David Matthew Jerry Koenig" EMAIL="koenigdavidmj@gmail.com" -APPROVED="Erik Hanson" +APPROVED="rworkman" diff --git a/network/broadcom-sta/doinst.sh b/network/broadcom-sta/doinst.sh index 267c75119655..99b4a8959899 100644 --- a/network/broadcom-sta/doinst.sh +++ b/network/broadcom-sta/doinst.sh @@ -1,5 +1,5 @@ # A good idea whenever kernel modules are added or changed: if [ -x sbin/depmod ]; then - /sbin/depmod -a @KERNEL@ 1> /dev/null 2> /dev/null + /sbin/depmod -a 1> /dev/null 2> /dev/null fi |