From 9d90d7e5f6e01ef7e85aff0f7c68fccbcd9863e7 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Fri, 21 May 2010 10:34:52 -0500 Subject: system/drbd-tools: Renamed to 'drbd' The standalone kernel module package isn't needed any more, so it's been removed. Therefore, we can simply call this one 'drbd' instead of 'drbd-tools' --- system/drbd-tools/README | 16 ----- system/drbd-tools/doinst.sh | 23 ------- system/drbd-tools/drbd-tools.SlackBuild | 97 ----------------------------- system/drbd-tools/drbd-tools.info | 10 --- system/drbd-tools/slack-desc | 19 ------ system/drbd/README | 7 +++ system/drbd/doinst.sh | 23 +++++++ system/drbd/drbd.SlackBuild | 105 ++++++++++++++++++++++++++++++++ system/drbd/drbd.info | 10 +++ system/drbd/slack-desc | 19 ++++++ 10 files changed, 164 insertions(+), 165 deletions(-) delete mode 100644 system/drbd-tools/README delete mode 100644 system/drbd-tools/doinst.sh delete mode 100755 system/drbd-tools/drbd-tools.SlackBuild delete mode 100644 system/drbd-tools/drbd-tools.info delete mode 100644 system/drbd-tools/slack-desc create mode 100644 system/drbd/README create mode 100644 system/drbd/doinst.sh create mode 100755 system/drbd/drbd.SlackBuild create mode 100644 system/drbd/drbd.info create mode 100644 system/drbd/slack-desc 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/doinst.sh b/system/drbd-tools/doinst.sh deleted file mode 100644 index 5963b24bb2..0000000000 --- a/system/drbd-tools/doinst.sh +++ /dev/null @@ -1,23 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -# Keep same perms on rc.drbd.new: -if [ -e etc/rc.d/rc.drbd ]; then - cp -a etc/rc.d/rc.drbd etc/rc.d/rc.drbd.new.incoming - cat etc/rc.d/rc.drbd.new > etc/rc.d/rc.drbd.new.incoming - mv etc/rc.d/rc.drbd.new.incoming etc/rc.d/rc.drbd.new -fi - -config etc/rc.d/rc.drbd.new -config etc/drbd.conf.new -config etc/drbd.d/global_common.conf.new diff --git a/system/drbd-tools/drbd-tools.SlackBuild b/system/drbd-tools/drbd-tools.SlackBuild deleted file mode 100755 index 53d9707a73..0000000000 --- a/system/drbd-tools/drbd-tools.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh -# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST -# Copyright 2009 Eric Hameleers , Eindhoven, Netherlands - -# Slackware build script for drbd -# Written by Zordrak -# Based on http://slackbuilds.org/template.SlackBuild - -PRGNAM=drbd-tools -SRCNAM=drbd -VERSION=${VERSION:-8.3.7} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -fi - -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 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --with-utils \ - --without-km \ - --with-udev \ - --with-pacemaker \ - --with-heartbeat \ - --with-distro=slackware \ - --without-xen \ - --without-rgmanager \ - --with-bashcompletion \ - --build=$ARCH-slackware-linux - -make tools -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 -) - -mv $PKG/etc/rc.d/drbd $PKG/etc/rc.d/rc.drbd.new -mv $PKG/etc/drbd.conf $PKG/etc/drbd.conf.new -mv $PKG/etc/drbd.d/global_common.conf $PKG/etc/drbd.d/global_common.conf.new - -mkdir -p $PKG/lib/udev/rules.d -mv $PKG/{etc,lib}/udev/rules.d/65-drbd.rules -rm -r $PKG/etc/udev - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING ChangeLog README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/drbd-tools/drbd-tools.info b/system/drbd-tools/drbd-tools.info deleted file mode 100644 index 6fc87cee02..0000000000 --- a/system/drbd-tools/drbd-tools.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="drbd-tools" -VERSION="8.3.7" -HOMEPAGE="http://www.drbd.org" -DOWNLOAD="http://oss.linbit.com/drbd/8.3/drbd-8.3.7.tar.gz" -MD5SUM="3b37c028b18bf2c8f5414396f681cf17" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -MAINTAINER="Zordrak" -EMAIL="slackbuilds@tpa.me.uk" -APPROVED="rworkman" 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/doinst.sh b/system/drbd/doinst.sh new file mode 100644 index 0000000000..5963b24bb2 --- /dev/null +++ b/system/drbd/doinst.sh @@ -0,0 +1,23 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +# Keep same perms on rc.drbd.new: +if [ -e etc/rc.d/rc.drbd ]; then + cp -a etc/rc.d/rc.drbd etc/rc.d/rc.drbd.new.incoming + cat etc/rc.d/rc.drbd.new > etc/rc.d/rc.drbd.new.incoming + mv etc/rc.d/rc.drbd.new.incoming etc/rc.d/rc.drbd.new +fi + +config etc/rc.d/rc.drbd.new +config etc/drbd.conf.new +config etc/drbd.d/global_common.conf.new diff --git a/system/drbd/drbd.SlackBuild b/system/drbd/drbd.SlackBuild new file mode 100755 index 0000000000..bca0efcbb7 --- /dev/null +++ b/system/drbd/drbd.SlackBuild @@ -0,0 +1,105 @@ +#!/bin/sh +# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST +# Copyright 2009 Eric Hameleers , Eindhoven, Netherlands + +# Slackware build script for drbd +# Written by Zordrak +# Based on http://slackbuilds.org/template.SlackBuild + +PRGNAM=drbd +VERSION=${VERSION:-8.3.7} +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 +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux \ + --with-utils \ + --without-km \ + --with-udev \ + --with-pacemaker \ + --with-heartbeat \ + --with-distro=slackware \ + --without-xen \ + --without-rgmanager \ + --with-bashcompletion \ + --build=$ARCH-slackware-linux + +make tools +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 + +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 +mv $PKG/etc/drbd.d/global_common.conf $PKG/etc/drbd.d/global_common.conf.new + +mkdir -p $PKG/lib/udev/rules.d +mv $PKG/{etc,lib}/udev/rules.d/65-drbd.rules +rm -r $PKG/etc/udev + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + COPYING ChangeLog README \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/drbd/drbd.info b/system/drbd/drbd.info new file mode 100644 index 0000000000..ced8e9cc04 --- /dev/null +++ b/system/drbd/drbd.info @@ -0,0 +1,10 @@ +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" +MD5SUM="3b37c028b18bf2c8f5414396f681cf17" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="Zordrak" +EMAIL="slackbuilds@tpa.me.uk" +APPROVED="rworkman" 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: -- cgit v1.2.3