From 9373a11b4a5e94520f914e4b4c021470e82aff86 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 6 Aug 2013 16:33:21 +0300 Subject: [PATCH 1/4] obexd: start via initscript --- .../bluez/config/org.bluez.obex.service | 5 -- packages/network/bluez/init.d/55_obexd | 46 +++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) delete mode 100644 packages/network/bluez/config/org.bluez.obex.service create mode 100644 packages/network/bluez/init.d/55_obexd diff --git a/packages/network/bluez/config/org.bluez.obex.service b/packages/network/bluez/config/org.bluez.obex.service deleted file mode 100644 index 4a34bd8b76..0000000000 --- a/packages/network/bluez/config/org.bluez.obex.service +++ /dev/null @@ -1,5 +0,0 @@ -[D-BUS Service] -Name=org.bluez.obex -Exec=/usr/lib/bluetooth/obexd -r /storage/downloads -User=root - diff --git a/packages/network/bluez/init.d/55_obexd b/packages/network/bluez/init.d/55_obexd new file mode 100644 index 0000000000..cd1995c6ce --- /dev/null +++ b/packages/network/bluez/init.d/55_obexd @@ -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 +)& From e650705b8a79231e4238ae32f7a384508185fb38 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 7 Aug 2013 00:42:50 +0300 Subject: [PATCH 2/4] projects/*/linux/linux.*.conf: CONFIG_PPP (ppp_generic) must be built-in --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 2 +- projects/ATV/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.x86_64.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.x86_64.conf | 2 +- projects/Generic_OSS/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/RPi/linux/linux.arm.conf | 2 +- projects/Ultra/linux/linux.x86_64.conf | 2 +- projects/Virtual/linux/linux.i386.conf | 2 +- projects/Virtual/linux/linux.x86_64.conf | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index 1ac2d81744..977b39d550 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -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 diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 80da55de68..f590e963d9 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -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 diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 10a4e9bb94..e5d8dd7690 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -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 diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index f2fe25d6e1..34b3119936 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -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 diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 67d131c21a..119c82bb90 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -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 diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index d672501f7f..d1adfb06e8 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -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 diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 161b7c3851..37ba9937df 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -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 diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 6520b4e4e5..37119cf078 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -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 diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 3611556bee..d44fe3fb78 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -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 diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 0b619f8cb1..84dca8faee 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -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 diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 5a193b25fa..6c1dd430f3 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -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 diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 1ac2d81744..977b39d550 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -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 From e9cb41965dddc44841d336c6d526a55212f7e01d Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 7 Aug 2013 00:56:50 +0300 Subject: [PATCH 3/4] projects/*/linux/linux.*.conf: CONFIG_TUN must be built-in --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 2 +- projects/ATV/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.x86_64.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.x86_64.conf | 2 +- projects/Generic_OSS/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/RPi/linux/linux.arm.conf | 2 +- projects/Ultra/linux/linux.x86_64.conf | 2 +- projects/Virtual/linux/linux.i386.conf | 2 +- projects/Virtual/linux/linux.x86_64.conf | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index 977b39d550..df33e0a9b1 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -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 diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index f590e963d9..f21aa88900 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -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 diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index e5d8dd7690..f75ba12ecb 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -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 diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 34b3119936..e0f97691fc 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -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 diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 119c82bb90..4d369a5c27 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -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 diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index d1adfb06e8..6b839f6805 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -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 diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 37ba9937df..dbe731c5cc 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -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 diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 37119cf078..c9269e92db 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -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 diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index d44fe3fb78..7d4fe2e870 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -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 # diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 84dca8faee..c752ca737e 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -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 diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 6c1dd430f3..7097df3df7 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -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 diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 977b39d550..df33e0a9b1 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -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 From 3941c7fe41c90011db55b2c11d01b0b59f50aa97 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 7 Aug 2013 00:59:38 +0300 Subject: [PATCH 4/4] bluez: ups. closes #2511 --- packages/network/bluez/package.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index 823d702a95..4f8f0d0430 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -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 -}