Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2013-08-07 10:32:42 +02:00
commit 943c3c55e3
29 changed files with 118 additions and 61 deletions

View File

@ -1,5 +0,0 @@
[D-BUS Service]
Name=org.bluez.obex
Exec=/usr/lib/bluetooth/obexd -r /storage/downloads
User=root

View File

@ -0,0 +1,46 @@
################################################################################
# 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
################################################################################
#
# start obexd
#
# runlevels: openelec, textmode
(
# can be called from openelec addon.
# ensure that environment is sane
. /etc/profile
if [ "$DEBUG" = "yes" ]; then
OBEXD_DEBUG="-d"
fi
OBEXD_ENABLED=true
OBEXD_ROOT=/storage/downloads
if [ -f $CONFIG_CACHE/service_bluez.conf ]; then
. $CONFIG_CACHE/service_bluez.conf
fi
if [ "$BLUEZ_ENABLED" == "true" -a "$OBEXD_ENABLED" == "true" ]; then
progress "Starting obexd"
wait_for_dbus
/usr/lib/bluetooth/obexd $OBEXD_DEBUG -r "$OBEXD_ROOT" &>/dev/null
fi
)&

View File

@ -70,7 +70,3 @@ pre_configure_target() {
rm -rf .$TARGET_NAME
}
post_makeinstall_target() {
mkdir -p $INSTALL/usr/share/dbus-1/system-services
cp $PKG_DIR/config/org.bluez.obex.service $INSTALL/usr/share/dbus-1/system-services
}

View File

@ -18,6 +18,6 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /run/connman 0755 root root 10d -
d /storage/.cache/connman 0755 root root 10d -
d /storage/.config/vpn-config 0755 root root 10d -
d /run/connman 0755 root root - -
d /storage/.cache/connman 0755 root root - -
d /storage/.config/vpn-config 0755 root root - -

View File

@ -18,6 +18,6 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /var/empty 0600 root root 10d -
d /var/empty 0600 root root - -
d /storage/.cache/ssh 0755 root root - -
d /storage/.ssh 0700 root root - -

View File

@ -18,9 +18,9 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /var/lib/polkit-1 0700 root root 10d -
d /var/lib/polkit-1/localauthority/10-vendor.d 0755 root root 10d -
d /var/lib/polkit-1/localauthority/20-org.d 0755 root root 10d -
d /var/lib/polkit-1/localauthority/30-site.d 0755 root root 10d -
d /var/lib/polkit-1/localauthority/50-local.d 0755 root root 10d -
d /var/lib/polkit-1/localauthority/90-mandatory.d 0755 root root 10d -
d /var/lib/polkit-1 0700 root root - -
d /var/lib/polkit-1/localauthority/10-vendor.d 0755 root root - -
d /var/lib/polkit-1/localauthority/20-org.d 0755 root root - -
d /var/lib/polkit-1/localauthority/30-site.d 0755 root root - -
d /var/lib/polkit-1/localauthority/50-local.d 0755 root root - -
d /var/lib/polkit-1/localauthority/90-mandatory.d 0755 root root - -

View File

@ -18,12 +18,12 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /var/cache 0755 root root 10d -
d /var/lib 0755 root root 10d -
d /var/lock 0755 root root 10d -
d /var/media 0755 root root 10d -
d /var/run 1777 root root 10d -
d /var/tmp 1777 root root 10d -
d /var/cache 0755 root root - -
d /var/lib 0755 root root - -
d /var/lock 0755 root root - -
d /var/media 0755 root root - -
d /var/run 1777 root root - -
d /var/tmp 1777 root root - -
f /var/run/utmp 1777 root root 10d -
f /var/log/wtmp 1777 root root 10d -
f /var/run/utmp 1777 root root - -
f /var/log/wtmp 1777 root root - -

View File

@ -18,7 +18,7 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /var/lib/dbus 0755 root root 10d -
d /var/run/dbus 0755 root root 10d -
d /var/lib/dbus 0755 root root - -
d /var/run/dbus 0755 root root - -
L /var/lib/dbus/machine-id - - - - /etc/machine-id

View File

@ -18,4 +18,4 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /storage/.cache 0755 root root 10d -
d /storage/.cache 0755 root root - -

View File

@ -18,4 +18,4 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /var/run/lirc 0755 root root 10d -
d /var/run/lirc 0755 root root - -

View File

@ -18,4 +18,4 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /var/run/lirc 0755 root root 10d -
d /var/run/lirc 0755 root root - -

View File

@ -18,4 +18,4 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /var/run/lirc 0755 root root 10d -
d /var/run/lirc 0755 root root - -

View File

@ -18,4 +18,4 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /var/lib/udisks 0755 root root 10d -
d /var/lib/udisks 0755 root root - -

View File

@ -18,4 +18,4 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /var/lib/upower 0755 root root 10d -
d /var/lib/upower 0755 root root - -

View File

@ -37,7 +37,6 @@ FC_CACHE_DIRS="/usr/share/fonts/ /usr/share/xbmc/media/Fonts/"
(
progress "Creating fontconfig cache"
if [ ! -f /storage/.cache/fontconfig/CACHEDIR.TAG ]; then
mkdir -p /storage/.cache/fontconfig
fc-cache $FC_CACHE_DIRS
fi
)&

View File

@ -0,0 +1,21 @@
################################################################################
# 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 /storage/.cache/fontconfig 0755 root root - -

View File

@ -18,5 +18,5 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
d /var/cache/xkb 0755 root root 10d -
d /var/cache/xkb 0755 root root - -
d /var/lib 0755 root root - -

View File

@ -1164,7 +1164,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
@ -1311,7 +1311,7 @@ CONFIG_REALTEK_PHY=y
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set

View File

@ -1143,7 +1143,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
@ -1240,7 +1240,7 @@ CONFIG_PHYLIB=y
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set

View File

@ -1139,7 +1139,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
@ -1245,7 +1245,7 @@ CONFIG_REALTEK_PHY=y
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set

View File

@ -1183,7 +1183,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
@ -1331,7 +1331,7 @@ CONFIG_REALTEK_PHY=y
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set

View File

@ -1164,7 +1164,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
@ -1312,7 +1312,7 @@ CONFIG_REALTEK_PHY=y
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set

View File

@ -1183,7 +1183,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
@ -1329,7 +1329,7 @@ CONFIG_REALTEK_PHY=y
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set

View File

@ -1126,7 +1126,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
@ -1233,7 +1233,7 @@ CONFIG_REALTEK_PHY=y
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set

View File

@ -1141,7 +1141,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
@ -1256,7 +1256,7 @@ CONFIG_REALTEK_PHY=y
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set

View File

@ -832,7 +832,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
#
@ -873,7 +873,7 @@ CONFIG_PHYLIB=y
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
# CONFIG_MICREL_KS8995MA is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set

View File

@ -1118,7 +1118,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
@ -1209,7 +1209,7 @@ CONFIG_PHYLIB=y
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set

View File

@ -1183,7 +1183,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
@ -1330,7 +1330,7 @@ CONFIG_REALTEK_PHY=y
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set

View File

@ -1164,7 +1164,7 @@ CONFIG_MII=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
CONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
@ -1311,7 +1311,7 @@ CONFIG_REALTEK_PHY=y
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_PPP=m
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not set