jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 21:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	packages/network/bluez/package.mk
This commit is contained in:
Stephan Raue 2013-08-07 02:21:51 +02:00
commit 631abab2a8
15 changed files with 71 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/network/bluez/config/org.bluez.obex.service
View File

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

46
packages/network/bluez/init.d/55_obexd Normal file
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
)&

1
packages/network/bluez/package.mk
View File

@ -73,3 +73,4 @@ pre_configure_target() {
post_makeinstall_target() { post_makeinstall_target() {
enable_service bluetooth.service enable_service bluetooth.service
} }

4
projects/ARCTIC_MC/linux/linux.x86_64.conf
View File

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

4
projects/ATV/linux/linux.i386.conf
View File

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

4
projects/Fusion/linux/linux.x86_64.conf
View File

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

4
projects/Generic/linux/linux.i386.conf
View File

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

4
projects/Generic/linux/linux.x86_64.conf
View File

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

4
projects/Generic_OSS/linux/linux.i386.conf
View File

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

4
projects/ION/linux/linux.x86_64.conf
View File

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

4
projects/Intel/linux/linux.x86_64.conf
View File

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

4
projects/RPi/linux/linux.arm.conf
View File

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

4
projects/Ultra/linux/linux.x86_64.conf
View File

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

4
projects/Virtual/linux/linux.i386.conf
View File

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

4
projects/Virtual/linux/linux.x86_64.conf
View File

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