7 files changed, 45 insertions, 46 deletions
diff --git a/system/drbd-tools/README b/system/drbd-tools/README
deleted file mode 100644
index c5923fcb46..0000000000
--- a/system/drbd-tools/README
+++ /dev/null
@@ -1,16 +0,0 @@
-drbd (Distributed Replicated Block Device)
-
-DRBD is a block device which is designed to build high availability
-clusters. This is done by mirroring a whole block device via
-(a dedicated) network. You could see it as a network RAID1. DRBD
-takes over the data, writes it to the local disk and sends it to
-the other host. On the other host, it takes it to the disk there.
-
-Starting with Linux 2.6.33, DRBD is officially integrated into the
-vanilla Linux kernel source. Besides the kernel integration, DRBD
-continues to be developed out of tree.
-
-This SlackBuild compiles the userland tools for working with DRBD.
-If you have a 2.6.33 kernel or later then you will need to ensure
-DRBD has been configured in your kernel.  If you have an earlier
-kernel, then you will need the drbd-kernel package.
diff --git a/system/drbd-tools/slack-desc b/system/drbd-tools/slack-desc
deleted file mode 100644
index 8dc9cd878e..0000000000
--- a/system/drbd-tools/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-drbd-tools: drbd-tools (Userland Tools for Distributed Replicated Block Device)
-drbd-tools:
-drbd-tools: DRBD is a block device which is designed to build high availability
-drbd-tools: clusters. This is done by mirroring a whole block device via
-drbd-tools: (a dedicated) network. You could see it as a network RAID1. DRBD
-drbd-tools: takes over the data, writes it to the local disk and sends it to
-drbd-tools: the other host. On the other host, it takes it to the disk there.
-drbd-tools:
-drbd-tools: This package provides the userland tools for working with DRBD.
-drbd-tools:
-drbd-tools: Home: http://www.drbd.org
diff --git a/system/drbd/README b/system/drbd/README
new file mode 100644
index 0000000000..fe0d0959b7
--- /dev/null
+++ b/system/drbd/README
@@ -0,0 +1,7 @@
+drbd (Distributed Replicated Block Device)
+
+DRBD is a block device which is designed to build high availability
+clusters. This is done by mirroring a whole block device via
+(a dedicated) network. You could see it as a network RAID1. DRBD
+takes over the data, writes it to the local disk and sends it to
+the other host. On the other host, it takes it to the disk there.
diff --git a/system/drbd-tools/doinst.sh b/system/drbd/doinst.sh
index 5963b24bb2..5963b24bb2 100644
--- a/system/drbd-tools/doinst.sh
+++ b/system/drbd/doinst.sh
diff --git a/system/drbd-tools/drbd-tools.SlackBuild b/system/drbd/drbd.SlackBuild
index 53d9707a73..bca0efcbb7 100755
--- a/system/drbd-tools/drbd-tools.SlackBuild
+++ b/system/drbd/drbd.SlackBuild
@@ -6,13 +6,21 @@
 # Written by Zordrak <sbo@tpa.me.uk>
 # Based on http://slackbuilds.org/template.SlackBuild
 
-PRGNAM=drbd-tools
-SRCNAM=drbd
+PRGNAM=drbd
 VERSION=${VERSION:-8.3.7}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -27,6 +35,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e # Exit on most errors
@@ -34,9 +45,9 @@ set -e # Exit on most errors
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -71,10 +82,7 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mv $PKG/etc/rc.d/drbd $PKG/etc/rc.d/rc.drbd.new
 mv $PKG/etc/drbd.conf $PKG/etc/drbd.conf.new
diff --git a/system/drbd-tools/drbd-tools.info b/system/drbd/drbd.info
index 6fc87cee02..ced8e9cc04 100644
--- a/system/drbd-tools/drbd-tools.info
+++ b/system/drbd/drbd.info
@@ -1,4 +1,4 @@
-PRGNAM="drbd-tools"
+PRGNAM="drbd"
 VERSION="8.3.7"
 HOMEPAGE="http://www.drbd.org"
 DOWNLOAD="http://oss.linbit.com/drbd/8.3/drbd-8.3.7.tar.gz"
diff --git a/system/drbd/slack-desc b/system/drbd/slack-desc
new file mode 100644
index 0000000000..d231e947a4
--- /dev/null
+++ b/system/drbd/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------------------------------------------------------|
+drbd: drbd (Userland Tools for Distributed Replicated Block Device)
+drbd:
+drbd: DRBD is a block device which is designed to build high availability
+drbd: clusters. This is done by mirroring a whole block device via
+drbd: (a dedicated) network. You could see it as a network RAID1. DRBD
+drbd: takes over the data, writes it to the local disk and sends it to
+drbd: the other host. On the other host, it takes it to the disk there.
+drbd:
+drbd: Home: http://www.drbd.org
+drbd:
+drbd: