From abfa84c32278df8a5e18373cd3a3b6a3c2a2702f Mon Sep 17 00:00:00 2001 From: Greg' Ar Tourter Date: Wed, 26 May 2010 21:11:49 -0500 Subject: [PATCH] Revert network/broadcom-sta removal and fix build This reverts commit 52f92278a45fcd32f9227c3dbab353a9cd50b460 and fixes compilation on 2.6.33.x kernels. --- network/broadcom-sta/README | 7 ++ ...broadcom-sta-5.60.48.36-linux-2.6.33.patch | 12 ++++ network/broadcom-sta/broadcom-sta.SlackBuild | 71 +++++++++++++++++++ network/broadcom-sta/broadcom-sta.info | 10 +++ network/broadcom-sta/doinst.sh | 5 ++ network/broadcom-sta/slack-desc | 19 +++++ 6 files changed, 124 insertions(+) create mode 100644 network/broadcom-sta/README create mode 100644 network/broadcom-sta/broadcom-sta-5.60.48.36-linux-2.6.33.patch create mode 100755 network/broadcom-sta/broadcom-sta.SlackBuild create mode 100644 network/broadcom-sta/broadcom-sta.info create mode 100644 network/broadcom-sta/doinst.sh create mode 100644 network/broadcom-sta/slack-desc diff --git a/network/broadcom-sta/README b/network/broadcom-sta/README new file mode 100644 index 0000000000..593784d0ec --- /dev/null +++ b/network/broadcom-sta/README @@ -0,0 +1,7 @@ +The broadcom-sta package includes the kernel module 'wl', which contains +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. 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 new file mode 100644 index 0000000000..a11ac3a709 --- /dev/null +++ b/network/broadcom-sta/broadcom-sta-5.60.48.36-linux-2.6.33.patch @@ -0,0 +1,12 @@ +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 + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)) + #include ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) ++#include + #else + #include + #endif diff --git a/network/broadcom-sta/broadcom-sta.SlackBuild b/network/broadcom-sta/broadcom-sta.SlackBuild new file mode 100755 index 0000000000..474884c454 --- /dev/null +++ b/network/broadcom-sta/broadcom-sta.SlackBuild @@ -0,0 +1,71 @@ +#!/bin/sh +# Slackware build script for broadcom-sta proprietary wireless driver +# Written by David Matthew Jerry Koenig +# Public domain. + +PRGNAM=broadcom-sta +VERSION=5.60.48.36 +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +KERNEL=${KERNEL:-$(uname -r)} + +PKG_VERSION=${VERSION}_$(echo $KERNEL | tr - _) + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +WORKDIR=$TMP/build-$PRGNAM +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +# 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" +elif [ "$ARCH" = "x86_64" ]; then + MY_ARCH="x86_64" +else + printf "\n\n$ARCH is not supported...\n" + exit 1 +fi + +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 + +patch -p1 < $CWD/broadcom-sta-5.60.48.36-linux-2.6.33.patch + +# Build the module +make -C /lib/modules/$KERNEL/build M=$WORKDIR clean +make -C /lib/modules/$KERNEL/build M=$WORKDIR + +# Install the module +mkdir -p $PKG/lib/modules/$KERNEL/kernel/extra +cp wl.ko $PKG/lib/modules/$KERNEL/kernel/extra + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +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 + +cd $PKG +chown -R root:root . +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/broadcom-sta/broadcom-sta.info b/network/broadcom-sta/broadcom-sta.info new file mode 100644 index 0000000000..cfc79fee5b --- /dev/null +++ b/network/broadcom-sta/broadcom-sta.info @@ -0,0 +1,10 @@ +PRGNAM="broadcom-sta" +VERSION="5.60.48.36" +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.48.36.tar.gz" +MD5SUM="0466d863405e1ab99d5e288fe886e852" +DOWNLOAD_x86_64="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5.60.48.36.tar.gz" +MD5SUM_x86_64="a78095ddcc30a191f64dccbc31b84de8" +MAINTAINER="David Matthew Jerry Koenig" +EMAIL="koenigdavidmj@gmail.com" +APPROVED="dsomero" diff --git a/network/broadcom-sta/doinst.sh b/network/broadcom-sta/doinst.sh new file mode 100644 index 0000000000..267c751196 --- /dev/null +++ b/network/broadcom-sta/doinst.sh @@ -0,0 +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 +fi + diff --git a/network/broadcom-sta/slack-desc b/network/broadcom-sta/slack-desc new file mode 100644 index 0000000000..9103fa4f6c --- /dev/null +++ b/network/broadcom-sta/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +broadcom-sta: broadcom-sta (Broadcom wireless drivers) +broadcom-sta: +broadcom-sta: Proprietary drivers for a number of Broadcom cards. Includes a +broadcom-sta: kernel module named 'wl'. +broadcom-sta: +broadcom-sta: For more information, see: +broadcom-sta: http://www.broadcom.com/support/802.11/linux_sta.php +broadcom-sta: +broadcom-sta: +broadcom-sta: +broadcom-sta: