Update to b4 (required to compile on 2.6.17.13 kernel) and many edits in the SlackBuild.

1 files changed, 75 insertions, 39 deletions

diff --git a/rt2500/build/rt2500.SlackBuild b/rt2500/build/rt2500.SlackBuild
index 1fd3a52c..8a248849 100755
--- a/rt2500/build/rt2500.SlackBuild
+++ b/rt2500/build/rt2500.SlackBuild
@@ -26,6 +26,11 @@
 #               takes so long.
 # 1.1.0.b3-2: 18/jan/2006 by Eric Hameleers <alien@slackware.com>
 #             * Rebuild, the 2.4.31 module got corrupted when gzipping.
+# 1.1.0.b4-1: 18/sep/2006 by Eric Hameleers <alien@slackware.com>
+#             * 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.
+# 
 # 
 # Run 'sh SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -35,36 +40,57 @@
 
 # --- INIT ---
 # Set initial variables:
-CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
 
 PRGNAM=rt2500
-VERSION=1.1.0.b4
+VERSION=${VERSION:-1.1.0.b4}
 SRCVER=1.1.0-b4
 ARCH=${ARCH:-i486}
-BUILD=1
+BUILD=2
 
 KVER=${KVER:-`uname -r`}
 KSRC=${KSRC:-/lib/modules/${KVER}/build}
 PATCHLEVEL=`echo $KVER | cut -d. -f2`
 
 PREDOC="cp -a ./Module/README README.module"
-DOCS="CHANGELOG FAQ LICENSE THANKS ./Module/iwpriv_usage.txt 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/rt2500-1.1.0-b4.tar.gz"
+SRCURL="http://surfnet.dl.sourceforge.net/sourceforge/rt2400/${PRGNAM}-${SRCVER}.tar.gz"
+
+# Where do we look for sources?
+CWD=`pwd`
+SRCDIR=`dirname $0`
+[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
+
+# Place to build (TMP) package (PKG) and output (OUTPUT) the program:
+TMP=${TMP:-/tmp/build}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
 
 ##
 ## --- 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
+# Catch unitialized variables:
+set -u
+P1=${1:-1}
+
+# Slackware 11 and up need other option (gcc > 3.3.x)
+if [ `gcc -dumpversion | tr -d  '.' |cut -c 1-2` -gt 33 ]; then
+  MOPT=tune
+else
+  MOPT=cpu
+fi
+
 case "$ARCH" in
-  i386)      SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  i386)      SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
-  i486)      SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   s390)      SLKCFLAGS="-O2"
@@ -81,28 +107,38 @@ case "$ARCH" in
              ;;
 esac
 
-
-PKG=$TMP/package-$PRGNAM
-
 if [ ! -d $TMP/tmp-$PRGNAM ]; then
   mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-elif [ "$1" != "--oldbuild" ]; then
+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
+
 
 # --- SOURCE FILE AVAILABILITY ---
 
-if ! [ -f ${CWD}/${SOURCE} ]; then
-  if ! [ "${SRCURL}" = "" ]; then
+if ! [ -f ${SRCDIR}/${SOURCE} ]; then
+  if ! [ "x${SRCURL}" == "x" ]; then
     echo "Source '${SOURCE}' not available yet... will download now:"
-    wget -nv -O "${CWD}/${SOURCE}" "${SRCURL}"
+    wget -nv -O "${SRCDIR}/${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 ]; then
       echo "Downloading '${SOURCE}' failed... aborting the build."
-      mv "${CWD}/${SOURCE} "${CWD}/${SOURCE}.FAIL
+      mv -f "${SRCDIR}/${SOURCE}" "${SRCDIR}/${SOURCE}".FAIL
       exit 1
     fi
   else
@@ -111,7 +147,7 @@ if ! [ -f ${CWD}/${SOURCE} ]; then
   fi
 fi
 
-if [ "$1" == "--download" ]; then
+if [ "$P1" == "--download" ]; then
   echo "Download complete."
   exit 0
 fi
@@ -123,17 +159,11 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG # place for the package to be built
-else
-  rm -rf $PKG/*
-fi
-
 cd $PKG
 
 # Explode the package framework:
-if [ -f $CWD/_$PRGNAM.tar.gz ]; then
-  explodepkg $CWD/_$PRGNAM.tar.gz
+if [ -f $SRCDIR/_$PRGNAM.tar.gz ]; then
+  explodepkg $SRCDIR/_$PRGNAM.tar.gz
 fi
 
 cd $TMP/tmp-$PRGNAM
@@ -142,12 +172,18 @@ cd $TMP/tmp-$PRGNAM
 # --- TARBALL EXTRACTION,PATCH,MODIFY ---
 
 echo "Extracting the source archive(s) for $PRGNAM..."
-if `file $CWD/${SOURCE} | grep -q ": bzip2"`; then
-  tar -xjvf $CWD/${SOURCE}
-elif `file $CWD/${SOURCE} | grep -qi ": zip"`; then
-  unzip $CWD/${SOURCE}
+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 $CWD/${SOURCE}
+  tar -xzvf $SRCDIR/${SOURCE} || true
+fi
+if [ $? -ne 0 ]; then
+  echo "Error in unpacking '${SOURCE}!' Aborting..."
+  exit $?
 fi
 
 mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION}
@@ -229,9 +265,9 @@ chmod -R o-w $PKG
 # --- PACKAGE DESCRIPTION ---
 
 mkdir -p $PKG/install
-cat $CWD/${PRGNAM}.slack-desc > $PKG/install/slack-desc
-if [ -f $CWD/doinst.sh ]; then
-  cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $SRCDIR/${PRGNAM}.slack-desc > $PKG/install/slack-desc
+if [ -f $SRCDIR/doinst.sh ]; then
+  cat $SRCDIR/doinst.sh > $PKG/install/doinst.sh
 fi
 
 
@@ -239,16 +275,16 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $TMP/$PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.tgz \
+makepkg --linkadd y --chown n $OUTPUT/$PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.tgz \
   2>&1 | tee $CWD/makepkg-${PRGNAM}.log
-(cd $TMP && md5sum $PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.tgz > $PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.tgz.md5)
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $TMP/$PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.txt
+(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 ---
 
 # Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
+if [ "$P1" = "--cleanup" ]; then
   rm -rf $TMP/tmp-$PRGNAM
   rm -rf $PKG
 fi