udisks: remove lvm2 support

This commit is contained in:
Stefan Saraev 2013-01-22 21:33:09 +02:00
parent 6be0094801
commit 4e0ce4645a
3 changed files with 31 additions and 4 deletions

View File

@ -26,10 +26,8 @@ mkdir -p $INSTALL/etc/dbus-1/system.d
cp $PKG_BUILD/data/org.freedesktop.UDisks.conf $INSTALL/etc/dbus-1/system.d
mkdir -p $INSTALL/lib/udev
cp -P $PKG_BUILD/src/probers/udisks-dm-export $INSTALL/lib/udev
cp -P $PKG_BUILD/src/probers/udisks-part-id $INSTALL/lib/udev
cp -P $PKG_BUILD/src/probers/udisks-probe-ata-smart $INSTALL/lib/udev
cp -P $PKG_BUILD/src/probers/udisks-probe-sas-expander $INSTALL/lib/udev
mkdir -p $INSTALL/lib/udev/rules.d
# cp $PKG_BUILD/data/80-udisks.rules $INSTALL/lib/udev/rules.d

View File

@ -25,8 +25,8 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.freedesktop.org/wiki/Software/udisks"
PKG_URL="http://hal.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS="sg3_utils systemd glib dbus dbus-glib parted LVM2 polkit libatasmart"
PKG_BUILD_DEPENDS="toolchain sg3_utils systemd glib dbus dbus-glib parted LVM2 polkit libatasmart"
PKG_DEPENDS="sg3_utils systemd glib dbus dbus-glib parted polkit libatasmart"
PKG_BUILD_DEPENDS="toolchain sg3_utils systemd glib dbus dbus-glib parted polkit libatasmart"
PKG_PRIORITY="optional"
PKG_SECTION="system"
PKG_SHORTDESC="udisks: a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management."

View File

@ -0,0 +1,29 @@
diff --git a/configure.ac b/configure.ac
index 50c0fe2..1d67de7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,10 +159,6 @@ PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
AC_SUBST(LIBPARTED_CFLAGS)
AC_SUBST(LIBPARTED_LIBS)
-PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
-AC_SUBST(DEVMAPPER_CFLAGS)
-AC_SUBST(DEVMAPPER_LIBS)
-
have_lvm2=no
AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--enable-lvm2], [enable LVM2 support]))
if test "x$enable_lvm2" = "xyes"; then
diff --git a/src/probers/Makefile.am b/src/probers/Makefile.am
index 06bb566..578b8ae 100644
--- a/src/probers/Makefile.am
+++ b/src/probers/Makefile.am
@@ -22,9 +22,7 @@ INCLUDES = \
udevhelperdir = $(slashlibdir)/udev
udevhelper_PROGRAMS = udisks-part-id \
- udisks-dm-export \
udisks-probe-ata-smart \
- udisks-probe-sas-expander \
$(NULL)
if HAVE_LVM2