#
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
PKG_NAME:=bluez-utils
PKG_VERSION:=3.36
-PKG_RELEASE:=7
+PKG_RELEASE:=10
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://bluez.sourceforge.net/download
all install
endef
-#copy bluetooth.conf nach /etc/dbus-1/system.d/
-
define Package/bluez-utils/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/sbin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
+ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/bluetooth
- $(CP) $(PKG_INSTALL_DIR)/../hcid/hcid.conf $(1)/etc/bluetooth/
- $(CP) $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf $(1)/etc/bluetooth/
+ $(CP) $(PKG_INSTALL_DIR)/etc/bluetooth/hcid.conf $(1)/etc/bluetooth/
+ $(CP) $(PKG_INSTALL_DIR)/etc/bluetooth/rfcomm.conf $(1)/etc/bluetooth/
$(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_DATA) ./files/bluetooth.conf $(1)/etc/config/bluetooth
+ $(INSTALL_DATA) ./files/bluetooth.config $(1)/etc/config/bluetooth
$(INSTALL_DIR) $(1)/etc/dbus-1/system.d/
$(INSTALL_DATA) ./files/bluetooth.dbus $(1)/etc/dbus-1/system.d/bluetooth.conf
$(INSTALL_DIR) $(1)/etc/init.d
local value="$3"
local _val
config_get_bool _val "$section" "$option" '0'
- [ "$_val" -gt 0 ] && append args "$3"
+ [ $_val -gt 0 ] && append args "$3"
}
append_string() {
hcid_config() {
local cfg="$1"
+ config_get_bool enabled "$cfg" "enabled" '1'
+ [ $enabled -gt 0 ] || return 1
args=""
append_bool "$cfg" nodaemon "-n"
append_string "$cfg" config "-f"
- config_get_bool enabled "$cfg" "enabled" '1'
- [ "$enabled" -gt 0 ] && /usr/sbin/hcid $args
+ service_start /usr/sbin/hcid $args
}
hciattach_config() {
local cfg="$1"
+ config_get_bool enabled "$cfg" "enabled" '1'
+ [ $enabled -gt 0 ] || return 1
args=""
append_string "$cfg" initspeed "-s" "115200"
append_string "$cfg" tty " " "ttyS1"
append_string "$cfg" type " " "csr"
append_string "$cfg" speed " " "115200"
append_string "$cfg" flow " " "noflow"
- config_get_bool enabled "$cfg" "enabled" '1'
- [ "$enabled" -gt 0 ] && /usr/sbin/hciattach $args
+ service_start /usr/sbin/hciattach $args
}
rfcomm_config() {
local cfg="$1"
+ config_get_bool enabled "$cfg" "enabled" '1'
+ [ $enabled -gt 0 ] || return 1
args=""
append_string "$cfg" config "-f"
- config_get_bool enabled "$cfg" "enabled" '1'
- [ "$enabled" -gt 0 ] && /usr/bin/rfcomm $args bind all
+ /usr/bin/rfcomm $args bind all
}
dund_config() {
local cfg="$1"
+ config_get_bool enabled "$cfg" "enabled" '1'
+ [ $enabled -gt 0 ] || return 1
args=""
append_bool "$cfg" listen "--listen"
append_string "$cfg" connect "--connect"
[ -z "$unit" ] || append args "unit $unit ipparam $ifn linkname $ifn"
fi
- config_get_bool enabled "$cfg" "enabled" '1'
- [ "$enabled" -gt 0 ] && /usr/bin/dund $args
+ service_start /usr/bin/dund $args
}
pand_config() {
local cfg="$1"
+ config_get_bool enabled "$cfg" "enabled" '1'
+ [ $enabled -gt 0 ] || return 1
args=""
append_bool "$cfg" listen "--listen"
append_string "$cfg" connect "--connect"
append_bool "$cfg" persist "--persist"
append_bool "$cfg" cache "--cache"
append_string "$cfg" pidfile "--pidfile"
- config_get_bool enabled "$cfg" "enabled" '1'
- [ "$enabled" -gt 0 ] && /usr/bin/pand $args
+ service_start /usr/bin/pand $args
}
start() {
}
stop() {
- killall dund
- killall pand
+ service_stop /usr/bin/dund
+ service_stop /usr/bin/pand
/usr/bin/rfcomm release all
- killall hciattach
- killall hcid
+ service_stop /usr/sbin/hciattach
+ service_stop /usr/sbin/hcid
}