From 3a130cd5009c8d3595b8afcde2421324572ce58b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 5 Aug 2013 10:40:48 +0200 Subject: [PATCH] upower: remove package 'upower', replaced by systemd Signed-off-by: Stephan Raue --- config/functions | 1 - packages/sysutils/upower/build | 46 ----------------- packages/sysutils/upower/install | 51 ------------------- packages/sysutils/upower/meta | 36 ------------- .../sysutils/upower/tmpfiles.d/32_upower.conf | 21 -------- 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/Ultra/options | 3 -- projects/Virtual/options | 3 -- scripts/image | 3 -- 16 files changed, 188 deletions(-) delete mode 100755 packages/sysutils/upower/build delete mode 100755 packages/sysutils/upower/install delete mode 100644 packages/sysutils/upower/meta delete mode 100644 packages/sysutils/upower/tmpfiles.d/32_upower.conf diff --git a/config/functions b/config/functions index d03b083684..5aca0c6184 100644 --- a/config/functions +++ b/config/functions @@ -361,7 +361,6 @@ 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 - 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" # Misc. Filesystems diff --git a/packages/sysutils/upower/build b/packages/sysutils/upower/build deleted file mode 100755 index 9bb9cae8e1..0000000000 --- a/packages/sysutils/upower/build +++ /dev/null @@ -1,46 +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 - -cd $PKG_BUILD -intltoolize --force -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --libexecdir=/usr/lib/upower \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - --with-backend=linux \ - --disable-systemd \ - --disable-man-pages \ - --disable-gtk-doc \ - --enable-gtk-doc-html \ - --enable-gtk-doc-pdf \ - --disable-nls \ - -make - -$MAKEINSTALL diff --git a/packages/sysutils/upower/install b/packages/sysutils/upower/install deleted file mode 100755 index 625a06a34f..0000000000 --- a/packages/sysutils/upower/install +++ /dev/null @@ -1,51 +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 - -mkdir -p $INSTALL/etc/UPower - cp $PKG_BUILD/etc/UPower.conf $INSTALL/etc/UPower - -mkdir -p $INSTALL/etc/dbus-1/system.d - cp $PKG_BUILD/src/org.freedesktop.UPower.conf $INSTALL/etc/dbus-1/system.d - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/tools/.libs/upower $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/libupower-glib/.libs/*.so* $INSTALL/usr/lib - -mkdir -p $INSTALL/usr/lib/upower - cp $PKG_BUILD/src/.libs/upowerd $INSTALL/usr/lib/upower - -mkdir -p $INSTALL/usr/share/dbus-1/interfaces - cp $PKG_BUILD/src/org.freedesktop.UPower.Device.xml $INSTALL/usr/share/dbus-1/interfaces - cp $PKG_BUILD/src/org.freedesktop.UPower.QoS.xml $INSTALL/usr/share/dbus-1/interfaces - cp $PKG_BUILD/src/org.freedesktop.UPower.Wakeups.xml $INSTALL/usr/share/dbus-1/interfaces - cp $PKG_BUILD/src/org.freedesktop.UPower.xml $INSTALL/usr/share/dbus-1/interfaces - -mkdir -p $INSTALL/usr/share/dbus-1/system-services - cp $PKG_BUILD/src/org.freedesktop.UPower.service $INSTALL/usr/share/dbus-1/system-services - -mkdir -p $INSTALL/usr/share/polkit-1/actions - cp $PKG_BUILD/policy/org.freedesktop.upower.policy $INSTALL/usr/share/polkit-1/actions - cp $PKG_BUILD/policy/org.freedesktop.upower.qos.policy $INSTALL/usr/share/polkit-1/actions diff --git a/packages/sysutils/upower/meta b/packages/sysutils/upower/meta deleted file mode 100644 index 02d091a43c..0000000000 --- a/packages/sysutils/upower/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="upower" -PKG_VERSION="0.9.19" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://upower.freedesktop.org/" -PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="systemd glib dbus polkit pm-utils libusb" -PKG_BUILD_DEPENDS="toolchain systemd glib dbus dbus-glib polkit libusb" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="upower: a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management." -PKG_LONGDESC="Upower 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. Upower 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" diff --git a/packages/sysutils/upower/tmpfiles.d/32_upower.conf b/packages/sysutils/upower/tmpfiles.d/32_upower.conf deleted file mode 100644 index a9d84fdf9e..0000000000 --- a/packages/sysutils/upower/tmpfiles.d/32_upower.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/upower 0755 root root 10d - diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 79e4e07119..1a60266927 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -225,9 +225,6 @@ # in the mediacenter also automount internally drives at boottime (yes / no) UDISKS="yes" -# build and install powermanagement support (upower) (yes / no) - UPOWER="yes" - # build and install exFAT fuse support (yes / no) EXFAT="yes" diff --git a/projects/ATV/options b/projects/ATV/options index 84eee1c200..af26dd9772 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -225,9 +225,6 @@ # in the mediacenter also automount internally drives at boottime (yes / no) UDISKS="yes" -# build and install powermanagement support (upower) (yes / no) - UPOWER="no" - # build and install exFAT fuse support (yes / no) EXFAT="yes" diff --git a/projects/Fusion/options b/projects/Fusion/options index dbd27ac3fa..718f64c682 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -225,9 +225,6 @@ # in the mediacenter also automount internally drives at boottime (yes / no) UDISKS="yes" -# build and install powermanagement support (upower) (yes / no) - UPOWER="yes" - # build and install exFAT fuse support (yes / no) EXFAT="yes" diff --git a/projects/Generic/options b/projects/Generic/options index eb421a149b..5b7142032f 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -225,9 +225,6 @@ # in the mediacenter also automount internally drives at boottime (yes / no) UDISKS="yes" -# build and install powermanagement support (upower) (yes / no) - UPOWER="yes" - # build and install exFAT fuse support (yes / no) EXFAT="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 4cf93f83cc..55341e0ceb 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -225,9 +225,6 @@ # in the mediacenter also automount internally drives at boottime (yes / no) UDISKS="yes" -# build and install powermanagement support (upower) (yes / no) - UPOWER="yes" - # build and install exFAT fuse support (yes / no) EXFAT="yes" diff --git a/projects/ION/options b/projects/ION/options index a158e1b09b..872aaa4b9f 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -225,9 +225,6 @@ # in the mediacenter also automount internally drives at boottime (yes / no) UDISKS="yes" -# build and install powermanagement support (upower) (yes / no) - UPOWER="yes" - # build and install exFAT fuse support (yes / no) EXFAT="yes" diff --git a/projects/Intel/options b/projects/Intel/options index d8b75e0117..f563d91d30 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -225,9 +225,6 @@ # in the mediacenter also automount internally drives at boottime (yes / no) UDISKS="yes" -# build and install powermanagement support (upower) (yes / no) - UPOWER="yes" - # build and install exFAT fuse support (yes / no) EXFAT="yes" diff --git a/projects/RPi/options b/projects/RPi/options index 4f9904e6e1..a4510985f8 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -225,9 +225,6 @@ # in the mediacenter also automount internally drives at boottime (yes / no) UDISKS="yes" -# build and install powermanagement support (upower) (yes / no) - UPOWER="no" - # build and install exFAT fuse support (yes / no) EXFAT="yes" diff --git a/projects/Ultra/options b/projects/Ultra/options index e88189243c..d07e5489dc 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -225,9 +225,6 @@ # in the mediacenter also automount internally drives at boottime (yes / no) UDISKS="yes" -# build and install powermanagement support (upower) (yes / no) - UPOWER="yes" - # build and install exFAT fuse support (yes / no) EXFAT="yes" diff --git a/projects/Virtual/options b/projects/Virtual/options index 78f994a37a..372eece045 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -220,9 +220,6 @@ # in the mediacenter also automount internally drives at boottime (yes / no) UDISKS="yes" -# build and install powermanagement support (upower) (yes / no) - UPOWER="yes" - # build and install exFAT fuse support (yes / no) EXFAT="yes" diff --git a/scripts/image b/scripts/image index 06a6e22731..ce0fe9ac21 100755 --- a/scripts/image +++ b/scripts/image @@ -121,9 +121,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" # Automounter support [ "$UDISKS" = "yes" ] && $SCRIPTS/install udisks -# Powermanagement support - [ "$UPOWER" = "yes" ] && $SCRIPTS/install upower - # NTFS 3G support [ "$EXFAT" = "yes" ] && $SCRIPTS/install fuse-exfat