Big update for the Slackware 12.0 kernel

1 files changed, 102 insertions, 139 deletions

diff --git a/rt2500/build/rt2500.SlackBuild b/rt2500/build/rt2500.SlackBuild
index 8a248849..38dfc0b7 100755
--- a/rt2500/build/rt2500.SlackBuild
+++ b/rt2500/build/rt2500.SlackBuild
@@ -1,12 +1,30 @@
 #!/bin/sh
-# Copyright (c) 2006 Eric Hameleers <alien@slackware.com>
-# Distributed under the terms of the GNU General Public License, Version 2
 # $Id$
+# Copyright (c) 2006,2007 Eric Hameleers <alien@slackware.com>
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
 #
 # Slackware SlackBuild script 
 # ===========================
-# By:        Eric Hameleers <alien@sox.homeip.net>
+# By:        Eric Hameleers <alien@slackware.com>
 # For:       rt2500
 # Descr:     driver for RaLink based wireless cards
 # URL:       http://rt2x00.sourceforge.net/
@@ -30,33 +48,26 @@
 #             * Update to b4, needed in order to compile on a 2.6.17.13 kernel.
 # 1.1.0.b4-2: 19/sep/2006 by Eric Hameleers <alien@slackware.com>
 #             * Added some leftover DOC files, many edits in the SlackBuild.
+# 20070724-1: 24/jul/2007 by Eric Hameleers <alien@slackware.com>
+#             * Using CVS version for Slackware 12.0 kernel support.
 # 
-# 
-# Run 'sh SlackBuild --cleanup' to build a Slackware package.
+# Run 'sh rt2500.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
 
-# --- INIT ---
 # Set initial variables:
 
 PRGNAM=rt2500
-VERSION=${VERSION:-1.1.0.b4}
-SRCVER=1.1.0-b4
+VERSION=${VERSION:-20070724}
+SRCVER="cvs-daily"
 ARCH=${ARCH:-i486}
-BUILD=2
-
-KVER=${KVER:-`uname -r`}
-KSRC=${KSRC:-/lib/modules/${KVER}/build}
-PATCHLEVEL=`echo $KVER | cut -d. -f2`
+BUILD=${BUILD:-1}
 
 PREDOC="cp -a ./Module/README README.module"
-DOCS="CHANGELOG FAQ LICENSE THANKS ./Module/iwpriv_usage.txt ./Module/TESTING \
-      README.module ./Utilitys/CONFIGURATION.TXT"
-
-SOURCE="${PRGNAM}-${SRCVER}.tar.gz"
-SRCURL="http://surfnet.dl.sourceforge.net/sourceforge/rt2400/${PRGNAM}-${SRCVER}.tar.gz"
+DOCS="CHANGELOG FAQ LICENSE THANKS ./Module/iwpriv_usage.txt  \
+      ./Module/TESTING README.module"
 
 # Where do we look for sources?
 CWD=`pwd`
@@ -68,13 +79,23 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Kernel module related parameters:
+KVER=${KVER:-`uname -r`}
+KSRC=${KSRC:-/lib/modules/${KVER}/build}
+PATCHLEVEL=`echo $KVER|cut -f 2 -d '.'`
+[ $PATCHLEVEL -eq 4 ] &&  MODCONFFILE=modules.conf || MODCONFFILE=modprobe.conf
+
+# Input URL: http://rt2x00.serialmonkey.com/rt2500-cvs-daily.tar.gz
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
+SRCURL="http://rt2x00.serialmonkey.com/${PRGNAM}-${SRCVER}.tar.gz"
+
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
 # Exit the script on errors:
 set -e
-trap 'echo "$0 FAILED!" | tee $CWD/error-${PRGNAM}.log' ERR
+trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
 # Catch unitialized variables:
 set -u
 P1=${1:-1}
@@ -107,42 +128,28 @@ case "$ARCH" in
              ;;
 esac
 
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-elif [ "$P1" != "--oldbuild" ]; then
-  # If the "--oldbuild" parameter is present, we keep
-  #  the old build files and continue;
-  # By default we remove the remnants of previous build and continue:
-  rm -rf $TMP/tmp-$PRGNAM/*
-fi
-
-if [ "$PKG" = "" -o "$PKG" = "/" ] ; then
-  echo "Please provide a sane value for the variable 'PKG'."
-  exit 1
-elif [ ! -d $PKG ]; then
-  mkdir -p $PKG  # place for the package to be built
-else
-  rm -rf $PKG/*  # We always erase old package's contents:
-fi
-
-if [ ! -d $OUTPUT ]; then
-  mkdir -p $OUTPUT  # place for the package to be saved
-fi
-
+# Create working directories:
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the remnants of previous build
+mkdir -p $PKG     # place for the package to be built
+rm -rf $PKG/*     # We always erase old package's contents:
+mkdir -p $OUTPUT  # place for the package to be saved
 
-# --- SOURCE FILE AVAILABILITY ---
-
-if ! [ -f ${SRCDIR}/${SOURCE} ]; then
+# Source file availability:
+if ! [ -f ${SOURCE} ]; then
   if ! [ "x${SRCURL}" == "x" ]; then
-    echo "Source '${SOURCE}' not available yet... will download now:"
-    wget -nv -O "${SRCDIR}/${SOURCE}" "${SRCURL}" || true
-    if [ $? -ne 0 ]; then
-      echo "Downloading '${SOURCE}' failed... aborting the build."
-      mv -f "${SRCDIR}/${SOURCE}" "${SRCDIR}/${SOURCE}".FAIL
+    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/`basename $SOURCE`"
+    echo "Source '`basename ${SOURCE}`' not available yet..."
+    echo "Will download file to `dirname $SOURCE`"
+    wget -nv --connect-timeout=30 -O "${SOURCE}" "${SRCURL}" || true
+    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
+      echo "Downloading '`basename ${SOURCE}`' failed... aborting the build."
+      mv -f "${SOURCE}" "${SOURCE}".FAIL
       exit 1
     fi
   else
-    echo "File '${SOURCE}' not available... aborting the build."
+    echo "File '`basename ${SOURCE}`' not available... aborting the build."
     exit 1
   fi
 fi
@@ -152,136 +159,92 @@ if [ "$P1" == "--download" ]; then
   exit 0
 fi
 
-
 # --- PACKAGE BUILDING ---
 
 echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-cd $PKG
-
-# Explode the package framework:
-if [ -f $SRCDIR/_$PRGNAM.tar.gz ]; then
-  explodepkg $SRCDIR/_$PRGNAM.tar.gz
-fi
-
 cd $TMP/tmp-$PRGNAM
-
-
-# --- TARBALL EXTRACTION,PATCH,MODIFY ---
-
 echo "Extracting the source archive(s) for $PRGNAM..."
-if `file $SRCDIR/${SOURCE} | grep -q ": bzip2"`; then
-  tar -xjvf $SRCDIR/${SOURCE} || true
-elif `file $SRCDIR/${SOURCE} | grep -qi ": zip"`; then
-  unzip $SRCDIR/${SOURCE} || true
-elif `file $SRCDIR/${SOURCE} | grep -qi ": 7-zip"`; then
-  7za -x $SRCDIR/${SOURCE} || true
-else
-  tar -xzvf $SRCDIR/${SOURCE} || true
+if `file ${SOURCE} | grep -q ": bzip2"`; then
+  tar -xjvf ${SOURCE}
+elif `file ${SOURCE} | grep -q ": gzip"`; then
+  tar -xzvf ${SOURCE}
 fi
-if [ $? -ne 0 ]; then
-  echo "Error in unpacking '${SOURCE}!' Aborting..."
-  exit $?
-fi
-
-mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION}
 cd ${PRGNAM}-${VERSION}
-chown -R root.root *
-
-
-# --- BUILDING ---
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
 
 echo Building ...
-
 ( cd Module
   CFLAGS="$SLKCFLAGS" \
-  make debug KERNDIR=$KSRC PATCHLEVEL=$PATCHLEVEL 2>&1 \
-    | tee $CWD/make-${PRGNAM}.log
-)
-
-( cd Utilitys
-  qmake -o Makefile raconfig${PRGNAM##rt}.pro
-  CFLAGS="$SLKCFLAGS" \
-  make 2>&1 | tee -a $CWD/make-${PRGNAM}.log
+  LDFLAGS="$SLKLDFLAGS" \
+  make debug KERNDIR=$KSRC PATCHLEVEL=$PATCHLEVEL \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 )
 
-#
 # Install all the needed stuff to the package dir
-#
 mkdir -p $PKG/lib/modules/${KVER}/drivers/net/wireless
-if [ $PATCHLEVEL -eq 4 ]; then
-  gzip -9cf Module/${PRGNAM}.o > $PKG/lib/modules/${KVER}/drivers/net/wireless/${PRGNAM}.o.gz
-else
-  cp -a Module/${PRGNAM}.ko $PKG/lib/modules/${KVER}/drivers/net/wireless/
-fi
+cp -a Module/${PRGNAM}.ko $PKG/lib/modules/${KVER}/drivers/net/wireless/
 
-mkdir -p $PKG/usr/bin
-install -m 0755 Utilitys/RaConfig${PRGNAM##rt} $PKG/usr/bin
-
-mkdir -p $PKG/etc/Wireless/RT2500STA
-cp -a Module/RT2500STA.dat $PKG/etc/Wireless/RT2500STA/RT2500STA.dat.sample
-
-# And now write the doinst.sh :
-mkdir -p $PKG/install
-cat <<-EEOOTT > $PKG/install/doinst.sh
+# Add this to the doinst.sh:
+! [ -d $PKG/install ] && mkdir -p $PKG/install
+cat <<-EEOOTT >> $PKG/install/doinst.sh
 	# Only run depmod on matching running kernel
 	# Slackware will run depmod anyway on reboot):
 	MYMODVER=$KVER
 	MYKERNEL=\`uname -r\`
-	
-	if [ "\$MYKERNEL" = "\$MYMODVER" ]; then 
+	if [ "\$MYKERNEL" = "\$MYMODVER" ]; then
 	  if [ -x sbin/depmod ]; then
 	    chroot . /sbin/depmod -a \$MYKERNEL 1> /dev/null 2> /dev/null
 	  fi
 	fi
-	EEOOTT
-
 
-# --- DOCUMENTATION ---
+	# Determine the rc.modules to use:
+	if [ -f etc/rc.d/rc.modules.local ]; then
+	  RCMODULES="etc/rc.d/rc.modules.local"
+	elif [ -f etc/rc.d/rc.modules-$(uname -r) ]; then
+	  RCMODULES="etc/rc.d/rc.modules-$(uname -r)"
+	else
+	  RCMODULES="etc/rc.d/rc.modules"
+	fi
+	
+	# Make sure the module gets loaded on boot:
+	if ! grep -q "$PRGNAM" \${RCMODULES} ; then
+	  echo "" >> \${RCMODULES}
+	  echo "# Load the kernel module" >> \${RCMODULES}
+	  echo "/sbin/modprobe $PRGNAM" >> \${RCMODULES}
+	fi
+	
+	EEOOTT
 
+# Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 $PREDOC
-cp -a $DOCS \
-      $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
-# Compress the man page(s)
-[ -d $PKG/usr/man ] && find $PKG/usr/man -name "*.?" -type f -exec gzip -9f {} \;
-
-# Strip binaries
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-
-# --- OWNERSHIP, RIGHTS ---
-
-chmod -R o-w $PKG
-
-
-# --- PACKAGE DESCRIPTION ---
+# Compress the man page(s):
+if [ -d $PKG/usr/man ]; then
+  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
+  for i in `find $PKG/usr/man -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+fi
 
+# Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/${PRGNAM}.slack-desc > $PKG/install/slack-desc
 if [ -f $SRCDIR/doinst.sh ]; then
-  cat $SRCDIR/doinst.sh > $PKG/install/doinst.sh
+  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
 fi
 
-
-# --- BUILDING ---
-
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/$PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.tgz \
-  2>&1 | tee $CWD/makepkg-${PRGNAM}.log
-(cd $OUTPUT && md5sum $PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.tgz > $PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.tgz.md5)
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/$PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.txt
-
-
-# --- CLEANUP ---
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.txt
 
 # Clean up the extra stuff:
 if [ "$P1" = "--cleanup" ]; then