Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-systemd

Conflicts:
	config/functions
	packages/sysutils/udisks/package.mk
	packages/sysutils/udisks/tmpfiles.d/udisks.conf
This commit is contained in:
Stephan Raue 2013-08-22 18:50:56 +02:00
commit 371455cd2d
23 changed files with 43 additions and 417 deletions

View File

@ -360,7 +360,8 @@ 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 - UDevil support:\t\t\t $UDEVIL"
config_message="$config_message\n - Parted support:\t\t\t $PARTED"
config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
# Misc. Filesystems

View File

@ -40,6 +40,11 @@ PKG_AUTORECONF="no"
PKG_DEPENDS="$PKG_DEPENDS nano"
fi
# parted support
if [ "$PARTED" = "yes" ]; then
PKG_DEPENDS="$PKG_DEPENDS parted"
fi
# nfs support
if [ "$NFS_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS rpcbind"

View File

@ -1,44 +0,0 @@
#!/bin/sh
################################################################################
# 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
################################################################################
. config/options $1
# comment out, seems to be broken in 0.19 - todo:
# export CC_FOR_BUILD="$HOST_CC"
# export BUILD_CFLAGS="$HOST_CFLAGS"
# export BUILD_LDFLAGS="$HOST_LDFLAGS"
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
--enable-static \
--disable-shared \
# building hosttools seems to be broken in 0.19 - todo:
make CFLAGS="$HOST_CFLAGS" LDFLAGS="$HOST_LDFLAGS" CC="$HOST_CC" -C strpool
make
$MAKEINSTALL

View File

@ -1,29 +0,0 @@
#!/bin/sh
################################################################################
# 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
################################################################################
. config/options $1
if [ "$DEVTOOLS" = yes ]; then
mkdir -p $INSTALL/usr/bin
cp -P $PKG_BUILD/sktest $INSTALL/usr/bin
cp -P $PKG_BUILD/skdump $INSTALL/usr/bin
fi

View File

@ -1,36 +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="libatasmart"
PKG_VERSION="0.19"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://0pointer.de/blog/projects/being-smart.html"
PKG_URL="http://0pointer.de/public/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="systemd"
PKG_BUILD_DEPENDS="toolchain systemd"
PKG_PRIORITY="optional"
PKG_SECTION="system"
PKG_SHORTDESC="libatasmart: a lean, small and clean implementation of an ATA S.M.A.R.T. reading and parsing library"
PKG_LONGDESC="libatasmart is a lean, small and clean implementation of an ATA S.M.A.R.T. reading and parsing library. It's fairly comprehensive, however I only support a subset of the full S.M.A.R.T. set of functions: those parts which made sense to me, not the esoteric stuff."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

View File

@ -1,59 +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
mkdir -p $INSTALL/usr/lib/udisks
cp $PKG_DIR/scripts/udisks-mount-disks $INSTALL/usr/lib/udisks
}
post_install() {
enable_service udisks-mount-disks.service
}

View File

@ -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];

View File

@ -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

View File

@ -1,74 +0,0 @@
From 072654b3ea2591e05cfbe80c06a00858e63f1f1a Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@redhat.com>
Date: Tue, 18 Oct 2011 12:19:22 -0400
Subject: [PATCH] udisks-daemon: Add --no-debug option and use this for D-Bus
activation
Signed-off-by: David Zeuthen <davidz@redhat.com>
---
data/org.freedesktop.UDisks.service.in | 2 +-
src/main.c | 28 ++++++++++++++++++++++++----
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/data/org.freedesktop.UDisks.service.in b/data/org.freedesktop.UDisks.service.in
index b3606a6..bc3542a 100644
--- a/data/org.freedesktop.UDisks.service.in
+++ b/data/org.freedesktop.UDisks.service.in
@@ -1,5 +1,5 @@
[D-BUS Service]
Name=org.freedesktop.UDisks
-Exec=@libexecdir@/udisks-daemon
+Exec=@libexecdir@/udisks-daemon --no-debug
User=root
diff --git a/src/main.c b/src/main.c
index 318db27..6e220b1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -141,12 +141,13 @@ main (int argc,
static char *helper_dir = NULL;
char *path;
int ret;
- static gboolean replace;
+ static gboolean replace = FALSE;
+ static gboolean no_debug = FALSE;
static GOptionEntry entries[] =
{
- { "replace", 0, 0, G_OPTION_ARG_NONE, &replace, "Replace existing daemon", NULL },
- { "helper-dir", 0, G_OPTION_FLAG_FILENAME, G_OPTION_ARG_STRING,
- &helper_dir, "Directory for helper tools", NULL },
+ { "no-debug", 'n', 0, G_OPTION_ARG_NONE, &no_debug, "Don't print debug information", NULL },
+ { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace, "Replace existing daemon", NULL },
+ { "helper-dir", 0, 0, G_OPTION_ARG_FILENAME, &helper_dir, "Directory for helper tools", NULL },
{ NULL } };
PROFILE ("main(): start");
@@ -181,6 +182,25 @@ main (int argc,
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
+ /* If --no-debug is requested don't clutter stdout/stderr etc.
+ */
+ if (no_debug)
+ {
+ gint dev_null_fd;
+ dev_null_fd = open ("/dev/null", O_RDWR);
+ if (dev_null_fd >= 0)
+ {
+ dup2 (dev_null_fd, STDIN_FILENO);
+ dup2 (dev_null_fd, STDOUT_FILENO);
+ dup2 (dev_null_fd, STDERR_FILENO);
+ close (dev_null_fd);
+ }
+ else
+ {
+ g_warning ("Error opening /dev/null: %m");
+ }
+ }
+
/* run with a controlled path */
if (helper_dir != NULL)
path = g_strdup_printf ("%s:" PACKAGE_LIBEXEC_DIR ":/sbin:/bin:/usr/sbin:/usr/bin", helper_dir);
--
1.7.6.4

View File

@ -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

View File

@ -1,31 +0,0 @@
#!/bin/sh
################################################################################
# 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
################################################################################
# automount internal disks
for DEVICE in `ls /sys/class/block/sd*/removable 2>/dev/null`; do
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
udisks --mount "$PART" >/dev/null
done
fi
done

View File

@ -1,9 +0,0 @@
[Unit]
Description=Mount internal disks
[Service]
ExecStart=/usr/lib/udisks/udisks-mount-disks
Type=oneshot
[Install]
WantedBy=multi-user.target

View File

@ -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 - -

View File

@ -217,15 +217,13 @@
# 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)
UDEVIL="no"
UDEVIL="yes"
# build and install parted support (yes / no)
PARTED="yes"
# build and install exFAT fuse support (yes / no)
EXFAT="yes"

View File

@ -217,15 +217,13 @@
# 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)
UDEVIL="no"
UDEVIL="yes"
# build and install parted support (yes / no)
PARTED="yes"
# build and install exFAT fuse support (yes / no)
EXFAT="yes"

View File

@ -217,15 +217,13 @@
# 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)
UDEVIL="no"
UDEVIL="yes"
# build and install parted support (yes / no)
PARTED="yes"
# build and install exFAT fuse support (yes / no)
EXFAT="yes"

View File

@ -217,15 +217,13 @@
# 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)
UDEVIL="no"
UDEVIL="yes"
# build and install parted support (yes / no)
PARTED="yes"
# build and install exFAT fuse support (yes / no)
EXFAT="yes"

View File

@ -217,15 +217,13 @@
# 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)
UDEVIL="no"
UDEVIL="yes"
# build and install parted support (yes / no)
PARTED="yes"
# build and install exFAT fuse support (yes / no)
EXFAT="yes"

View File

@ -217,15 +217,13 @@
# 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)
UDEVIL="no"
UDEVIL="yes"
# build and install parted support (yes / no)
PARTED="yes"
# build and install exFAT fuse support (yes / no)
EXFAT="yes"

View File

@ -217,15 +217,13 @@
# 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)
UDEVIL="no"
UDEVIL="yes"
# build and install parted support (yes / no)
PARTED="yes"
# build and install exFAT fuse support (yes / no)
EXFAT="yes"

View File

@ -217,15 +217,13 @@
# 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)
UDEVIL="no"
UDEVIL="yes"
# build and install parted support (yes / no)
PARTED="yes"
# build and install exFAT fuse support (yes / no)
EXFAT="yes"

View File

@ -212,15 +212,13 @@
# 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)
UDEVIL="no"
UDEVIL="yes"
# build and install parted support (yes / no)
PARTED="yes"
# build and install exFAT fuse support (yes / no)
EXFAT="yes"

View File

@ -119,7 +119,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
[ ! "$MEDIACENTER" = "no" ] && $SCRIPTS/install mediacenter
# Automounter support
[ "$UDISKS" = "yes" ] && $SCRIPTS/install udisks
[ "$UDEVIL" = "yes" ] && $SCRIPTS/install udevil
# NTFS 3G support