From a5e846d3b65f8d7df79ba5af920e0bd252c87b0a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 22 Aug 2013 18:34:08 +0200 Subject: [PATCH 1/4] udisks: remove package 'udisks', will be replaced by package 'udevil' Signed-off-by: Stephan Raue --- config/functions | 1 - .../sysutils/udisks/init.d/31_mount-disks | 41 --------------- packages/sysutils/udisks/package.mk | 52 ------------------- .../udisks-1.0.4-01-busybox_mount-0.1.patch | 12 ----- .../patches/udisks-1.0.4-automake-1.13.patch | 17 ------ .../udisks-1.0.4-remove-lvm2-support.patch | 29 ----------- .../sysutils/udisks/tmpfiles.d/31_udisks.conf | 21 -------- projects/ARCTIC_MC/options | 5 -- projects/ATV/options | 5 -- projects/Fusion/options | 5 -- projects/Generic/options | 5 -- projects/Generic_OSS/options | 5 -- projects/ION/options | 5 -- projects/Intel/options | 5 -- projects/RPi/options | 5 -- projects/Virtual/options | 5 -- scripts/image | 1 - 17 files changed, 219 deletions(-) delete mode 100644 packages/sysutils/udisks/init.d/31_mount-disks delete mode 100644 packages/sysutils/udisks/package.mk delete mode 100644 packages/sysutils/udisks/patches/udisks-1.0.4-01-busybox_mount-0.1.patch delete mode 100644 packages/sysutils/udisks/patches/udisks-1.0.4-automake-1.13.patch delete mode 100644 packages/sysutils/udisks/patches/udisks-1.0.4-remove-lvm2-support.patch delete mode 100644 packages/sysutils/udisks/tmpfiles.d/31_udisks.conf 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 From f81f72ac125858b4dec7a5d808e9f6946f4dc4bf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 22 Aug 2013 18:37:33 +0200 Subject: [PATCH 2/4] libatasmart: remove package 'libatasmart' Signed-off-by: Stephan Raue --- packages/sysutils/libatasmart/build | 44 --------------------------- packages/sysutils/libatasmart/install | 29 ------------------ packages/sysutils/libatasmart/meta | 36 ---------------------- 3 files changed, 109 deletions(-) delete mode 100755 packages/sysutils/libatasmart/build delete mode 100755 packages/sysutils/libatasmart/install delete mode 100644 packages/sysutils/libatasmart/meta diff --git a/packages/sysutils/libatasmart/build b/packages/sysutils/libatasmart/build deleted file mode 100755 index c84dfb579e..0000000000 --- a/packages/sysutils/libatasmart/build +++ /dev/null @@ -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 diff --git a/packages/sysutils/libatasmart/install b/packages/sysutils/libatasmart/install deleted file mode 100755 index cdab4b5ea1..0000000000 --- a/packages/sysutils/libatasmart/install +++ /dev/null @@ -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 diff --git a/packages/sysutils/libatasmart/meta b/packages/sysutils/libatasmart/meta deleted file mode 100644 index ee0276e027..0000000000 --- a/packages/sysutils/libatasmart/meta +++ /dev/null @@ -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" From 5eff68c97d62503bc520f8639b8aec9ca9c8667b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 22 Aug 2013 18:40:35 +0200 Subject: [PATCH 3/4] projects/*: enable udevil support Signed-off-by: Stephan Raue --- config/functions | 1 + projects/ARCTIC_MC/options | 2 +- projects/ATV/options | 2 +- projects/Fusion/options | 2 +- projects/Generic/options | 2 +- projects/Generic_OSS/options | 2 +- projects/ION/options | 2 +- projects/Intel/options | 2 +- projects/RPi/options | 2 +- projects/Virtual/options | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/config/functions b/config/functions index 9cd81e50d3..86b5d6b770 100644 --- a/config/functions +++ b/config/functions @@ -344,6 +344,7 @@ 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 - UDevil support:\t\t\t $UDEVIL" 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/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index d867ae1063..c1f2d6948c 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -220,7 +220,7 @@ # 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 powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/ATV/options b/projects/ATV/options index d735ba3922..0fbd64db14 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -220,7 +220,7 @@ # 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 powermanagement support (upower) (yes / no) UPOWER="no" diff --git a/projects/Fusion/options b/projects/Fusion/options index d5b323a800..e23bfaeae7 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -220,7 +220,7 @@ # 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 powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 1dab84958f..44a5f08de7 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -220,7 +220,7 @@ # 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 powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 40ef017737..0eb2e0d225 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -220,7 +220,7 @@ # 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 powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/ION/options b/projects/ION/options index 1e23b7137a..3db75212be 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -220,7 +220,7 @@ # 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 powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/Intel/options b/projects/Intel/options index 04737f239e..8a60c0a833 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -220,7 +220,7 @@ # 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 powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/RPi/options b/projects/RPi/options index 17df7558d0..5e68221798 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -220,7 +220,7 @@ # 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 powermanagement support (upower) (yes / no) UPOWER="no" diff --git a/projects/Virtual/options b/projects/Virtual/options index a21a0c2ffd..0dfebb82cf 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -215,7 +215,7 @@ # 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 powermanagement support (upower) (yes / no) UPOWER="yes" From 21fb919659eecf13b5b1058b4ed85b2076dee2e0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 22 Aug 2013 18:46:21 +0200 Subject: [PATCH 4/4] busybox: install optional parted support Signed-off-by: Stephan Raue --- config/functions | 1 + packages/sysutils/busybox/meta | 5 +++++ projects/ARCTIC_MC/options | 3 +++ projects/ATV/options | 3 +++ projects/Fusion/options | 3 +++ projects/Generic/options | 3 +++ projects/Generic_OSS/options | 3 +++ projects/ION/options | 3 +++ projects/Intel/options | 3 +++ projects/RPi/options | 3 +++ projects/Virtual/options | 3 +++ 11 files changed, 33 insertions(+) diff --git a/config/functions b/config/functions index 86b5d6b770..a72cbd8266 100644 --- a/config/functions +++ b/config/functions @@ -345,6 +345,7 @@ if [ "$BOOTLOADER" = "u-boot" ]; then config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE" fi 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 - UPower support:\t\t\t $UPOWER" config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT" diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta index 6d68639492..ba3f1647af 100644 --- a/packages/sysutils/busybox/meta +++ b/packages/sysutils/busybox/meta @@ -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" diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index c1f2d6948c..d46e85fcc3 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -222,6 +222,9 @@ # mediacenter also automount internally drives at boottime via udev (yes / no) UDEVIL="yes" +# build and install parted support (yes / no) + PARTED="yes" + # build and install powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/ATV/options b/projects/ATV/options index 0fbd64db14..3668febef9 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -222,6 +222,9 @@ # mediacenter also automount internally drives at boottime via udev (yes / no) UDEVIL="yes" +# build and install parted support (yes / no) + PARTED="yes" + # build and install powermanagement support (upower) (yes / no) UPOWER="no" diff --git a/projects/Fusion/options b/projects/Fusion/options index e23bfaeae7..992872a711 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -222,6 +222,9 @@ # mediacenter also automount internally drives at boottime via udev (yes / no) UDEVIL="yes" +# build and install parted support (yes / no) + PARTED="yes" + # build and install powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 44a5f08de7..9e50d1a50b 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -222,6 +222,9 @@ # mediacenter also automount internally drives at boottime via udev (yes / no) UDEVIL="yes" +# build and install parted support (yes / no) + PARTED="yes" + # build and install powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 0eb2e0d225..9b21c63328 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -222,6 +222,9 @@ # mediacenter also automount internally drives at boottime via udev (yes / no) UDEVIL="yes" +# build and install parted support (yes / no) + PARTED="yes" + # build and install powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/ION/options b/projects/ION/options index 3db75212be..9019a682f1 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -222,6 +222,9 @@ # mediacenter also automount internally drives at boottime via udev (yes / no) UDEVIL="yes" +# build and install parted support (yes / no) + PARTED="yes" + # build and install powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/Intel/options b/projects/Intel/options index 8a60c0a833..4b0445ec77 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -222,6 +222,9 @@ # mediacenter also automount internally drives at boottime via udev (yes / no) UDEVIL="yes" +# build and install parted support (yes / no) + PARTED="yes" + # build and install powermanagement support (upower) (yes / no) UPOWER="yes" diff --git a/projects/RPi/options b/projects/RPi/options index 5e68221798..66ecdee32d 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -222,6 +222,9 @@ # mediacenter also automount internally drives at boottime via udev (yes / no) UDEVIL="yes" +# build and install parted support (yes / no) + PARTED="yes" + # build and install powermanagement support (upower) (yes / no) UPOWER="no" diff --git a/projects/Virtual/options b/projects/Virtual/options index 0dfebb82cf..6e1716cc4d 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -217,6 +217,9 @@ # mediacenter also automount internally drives at boottime via udev (yes / no) UDEVIL="yes" +# build and install parted support (yes / no) + PARTED="yes" + # build and install powermanagement support (upower) (yes / no) UPOWER="yes"