diff --git a/config/functions b/config/functions index 1532100303..9cd81e50d3 100644 --- a/config/functions +++ b/config/functions @@ -344,7 +344,6 @@ if [ "$BOOTLOADER" = "u-boot" ]; then config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG" config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE" fi - config_message="$config_message\n - UDisks support:\t\t\t $UDISKS" config_message="$config_message\n - UPower support:\t\t\t $UPOWER" config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT" diff --git a/packages/sysutils/udisks/init.d/31_mount-disks b/packages/sysutils/udisks/init.d/31_mount-disks deleted file mode 100644 index 4fa2945235..0000000000 --- a/packages/sysutils/udisks/init.d/31_mount-disks +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# Copyright (C) 2009-2010 OpenELEC.tv -# http://www.openelec.tv -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -# -# automount internal disks -# -# runlevels: openelec, textmode - -( - progress "automount internal disks" - - wait_for_dbus - - for DEVICE in `ls /sys/class/block/sd*/removable 2>/dev/null`; do - progress "automount : DEVICE $DEVICE" - if [ "$(cat $DEVICE)" = "0" ]; then - DISK=$(echo "$DEVICE" | sed -e "s,/sys/class/block,/dev," -e "s,/removable,,") - for PART in $(ls "$DISK"[0-9]*);do - progress "automount : PART $PART" - udisks --mount "$PART" 2>&1 | logger -s -t automount - done - fi - done &>/dev/null -)& diff --git a/packages/sysutils/udisks/package.mk b/packages/sysutils/udisks/package.mk deleted file mode 100644 index 31c67651d8..0000000000 --- a/packages/sysutils/udisks/package.mk +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="udisks" -PKG_VERSION="1.0.4" -PKG_REV="1" -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="systemd glib dbus parted polkit libatasmart" -PKG_BUILD_DEPENDS_TARGET="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." -PKG_LONGDESC="Udisks is a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management and replace the current monolithic Linux HAL. Udisks includes the ability to enumerate system devices and send notifications when hardware is added or removed from the computer system." - -PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" - -PKG_CONFIGURE_OPTS_TARGET="--datadir=/usr/share \ - --libexecdir=/usr/lib/udisks \ - --disable-man-pages \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-lvm2 \ - --disable-dmmp \ - --disable-remote-access \ - --enable-nls" - -post_makeinstall_target() { - rm -rf $INSTALL/etc/profile.d - rm -rf $INSTALL/lib/udev/rules.d -} diff --git a/packages/sysutils/udisks/patches/udisks-1.0.4-01-busybox_mount-0.1.patch b/packages/sysutils/udisks/patches/udisks-1.0.4-01-busybox_mount-0.1.patch deleted file mode 100644 index 24567e8c35..0000000000 --- a/packages/sysutils/udisks/patches/udisks-1.0.4-01-busybox_mount-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur udisks-1.0.2/src/device.c udisks-1.0.2.patch/src/device.c ---- udisks-1.0.2/src/device.c 2010-11-06 17:41:23.000000000 +0100 -+++ udisks-1.0.2.patch/src/device.c 2011-03-08 23:25:46.382977610 +0100 -@@ -6307,7 +6307,7 @@ - options = prepend_default_mount_options (fsmo, caller_uid, given_options); - - /* validate mount options and check for authorizations */ -- s = g_string_new ("uhelper=udisks,nodev,nosuid"); -+ s = g_string_new ("nodev,nosuid"); - for (n = 0; options[n] != NULL; n++) - { - const char *option = options[n]; diff --git a/packages/sysutils/udisks/patches/udisks-1.0.4-automake-1.13.patch b/packages/sysutils/udisks/patches/udisks-1.0.4-automake-1.13.patch deleted file mode 100644 index 406bf50dcd..0000000000 --- a/packages/sysutils/udisks/patches/udisks-1.0.4-automake-1.13.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur udisks-1.0.4/configure.ac udisks-1.0.4.patch/configure.ac ---- udisks-1.0.4/configure.ac 2011-08-26 17:08:35.000000000 +0200 -+++ udisks-1.0.4.patch/configure.ac 2013-01-12 16:43:38.483117569 +0100 -@@ -3,12 +3,11 @@ - AC_PREREQ(2.59c) - AC_INIT(udisks, 1.0.4, http://bugs.freedesktop.org/enter_bug.cgi?product=udisks) - AM_INIT_AUTOMAKE(udisks, 1.0.4) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AM_MAINTAINER_MODE - - AC_ISC_POSIX - AC_PROG_CC --AM_PROG_CC_STDC - AC_HEADER_STDC - AM_PROG_LIBTOOL - AC_PROG_MAKE_SET diff --git a/packages/sysutils/udisks/patches/udisks-1.0.4-remove-lvm2-support.patch b/packages/sysutils/udisks/patches/udisks-1.0.4-remove-lvm2-support.patch deleted file mode 100644 index 8fbe5dcbee..0000000000 --- a/packages/sysutils/udisks/patches/udisks-1.0.4-remove-lvm2-support.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 diff --git a/packages/sysutils/udisks/tmpfiles.d/31_udisks.conf b/packages/sysutils/udisks/tmpfiles.d/31_udisks.conf deleted file mode 100644 index fe79b7e0cd..0000000000 --- a/packages/sysutils/udisks/tmpfiles.d/31_udisks.conf +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -d /var/lib/udisks 0755 root root - - diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 571555d51c..d867ae1063 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -217,11 +217,6 @@ # build and install OpenVPN support (yes / no) OPENVPN_SUPPORT="yes" -# build and install diskmounter service (udisks) -# this service provide auto mounting support for external drives -# in the mediacenter also automount internally drives at boottime (yes / no) - UDISKS="yes" - # build and install diskmounter support (udevil) # this service provide auto mounting support for external drives in the # mediacenter also automount internally drives at boottime via udev (yes / no) diff --git a/projects/ATV/options b/projects/ATV/options index 45842b8e62..d735ba3922 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -217,11 +217,6 @@ # build and install OpenVPN support (yes / no) OPENVPN_SUPPORT="yes" -# build and install diskmounter service (udisks) -# this service provide auto mounting support for external drives -# in the mediacenter also automount internally drives at boottime (yes / no) - UDISKS="yes" - # build and install diskmounter support (udevil) # this service provide auto mounting support for external drives in the # mediacenter also automount internally drives at boottime via udev (yes / no) diff --git a/projects/Fusion/options b/projects/Fusion/options index 304ae9d3ef..d5b323a800 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -217,11 +217,6 @@ # build and install OpenVPN support (yes / no) OPENVPN_SUPPORT="yes" -# build and install diskmounter service (udisks) -# this service provide auto mounting support for external drives -# in the mediacenter also automount internally drives at boottime (yes / no) - UDISKS="yes" - # build and install diskmounter support (udevil) # this service provide auto mounting support for external drives in the # mediacenter also automount internally drives at boottime via udev (yes / no) diff --git a/projects/Generic/options b/projects/Generic/options index 6d574df096..1dab84958f 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -217,11 +217,6 @@ # build and install OpenVPN support (yes / no) OPENVPN_SUPPORT="yes" -# build and install diskmounter service (udisks) -# this service provide auto mounting support for external drives -# in the mediacenter also automount internally drives at boottime (yes / no) - UDISKS="yes" - # build and install diskmounter support (udevil) # this service provide auto mounting support for external drives in the # mediacenter also automount internally drives at boottime via udev (yes / no) diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index e9bf268f7f..40ef017737 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -217,11 +217,6 @@ # build and install OpenVPN support (yes / no) OPENVPN_SUPPORT="yes" -# build and install diskmounter service (udisks) -# this service provide auto mounting support for external drives -# in the mediacenter also automount internally drives at boottime (yes / no) - UDISKS="yes" - # build and install diskmounter support (udevil) # this service provide auto mounting support for external drives in the # mediacenter also automount internally drives at boottime via udev (yes / no) diff --git a/projects/ION/options b/projects/ION/options index 87ae494780..1e23b7137a 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -217,11 +217,6 @@ # build and install OpenVPN support (yes / no) OPENVPN_SUPPORT="yes" -# build and install diskmounter service (udisks) -# this service provide auto mounting support for external drives -# in the mediacenter also automount internally drives at boottime (yes / no) - UDISKS="yes" - # build and install diskmounter support (udevil) # this service provide auto mounting support for external drives in the # mediacenter also automount internally drives at boottime via udev (yes / no) diff --git a/projects/Intel/options b/projects/Intel/options index ff3f443e88..04737f239e 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -217,11 +217,6 @@ # build and install OpenVPN support (yes / no) OPENVPN_SUPPORT="yes" -# build and install diskmounter service (udisks) -# this service provide auto mounting support for external drives -# in the mediacenter also automount internally drives at boottime (yes / no) - UDISKS="yes" - # build and install diskmounter support (udevil) # this service provide auto mounting support for external drives in the # mediacenter also automount internally drives at boottime via udev (yes / no) diff --git a/projects/RPi/options b/projects/RPi/options index 77c7d43fc4..17df7558d0 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -217,11 +217,6 @@ # build and install OpenVPN support (yes / no) OPENVPN_SUPPORT="yes" -# build and install diskmounter service (udisks) -# this service provide auto mounting support for external drives -# in the mediacenter also automount internally drives at boottime (yes / no) - UDISKS="yes" - # build and install diskmounter support (udevil) # this service provide auto mounting support for external drives in the # mediacenter also automount internally drives at boottime via udev (yes / no) diff --git a/projects/Virtual/options b/projects/Virtual/options index af2a4ff924..a21a0c2ffd 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -212,11 +212,6 @@ # build and install OpenVPN support (yes / no) OPENVPN_SUPPORT="yes" -# build and install diskmounter service (udisks) -# this service provide auto mounting support for external drives -# in the mediacenter also automount internally drives at boottime (yes / no) - UDISKS="yes" - # build and install diskmounter support (udevil) # this service provide auto mounting support for external drives in the # mediacenter also automount internally drives at boottime via udev (yes / no) diff --git a/scripts/image b/scripts/image index 5e1e7a29cd..64b92b4939 100755 --- a/scripts/image +++ b/scripts/image @@ -120,7 +120,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" [ ! "$MEDIACENTER" = "no" ] && $SCRIPTS/install mediacenter # Automounter support - [ "$UDISKS" = "yes" ] && $SCRIPTS/install udisks [ "$UDEVIL" = "yes" ] && $SCRIPTS/install udevil # Powermanagement support