summaryrefslogtreecommitdiffstats
path: root/source/a/udisks2
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/udisks2')
-rw-r--r--source/a/udisks2/slack-desc8
-rwxr-xr-xsource/a/udisks2/udisks2.SlackBuild14
2 files changed, 16 insertions, 6 deletions
diff --git a/source/a/udisks2/slack-desc b/source/a/udisks2/slack-desc
index 0d6d44272..54ef165ed 100644
--- a/source/a/udisks2/slack-desc
+++ b/source/a/udisks2/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
@@ -14,6 +14,6 @@ udisks2:
udisks2: It also includes a command-line tool, udisks(1), that can be used to
udisks2: query and control the daemon.
udisks2:
-udisks2: Homepage: http://www.freedesktop.org/wiki/Software/udisks
+udisks2: Homepage: http://www.freedesktop.org/wiki/Software/udisks
udisks2:
udisks2:
diff --git a/source/a/udisks2/udisks2.SlackBuild b/source/a/udisks2/udisks2.SlackBuild
index ac16da2e7..32fe6903a 100755
--- a/source/a/udisks2/udisks2.SlackBuild
+++ b/source/a/udisks2/udisks2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for udisks
@@ -24,6 +24,8 @@
# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=udisks2
SRCNAM=udisks
VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
@@ -43,6 +45,14 @@ if [ -z "$ARCH" ]; then
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
@@ -65,7 +75,6 @@ case "$ARCH" in
*) TARGET=$ARCH-slackware-linux ;;
esac
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -92,6 +101,7 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-static \
--mandir=/usr/man \
--docdir=/usr/doc/$PKGNAM-$VERSION \
+ --enable-lvm2 \
--build=$TARGET || exit 1
make $NUMJOBS || make || exit 1