diff --git a/packages/network/bluez/install b/packages/network/bluez/install index 76982a62e1..e92f13c99c 100755 --- a/packages/network/bluez/install +++ b/packages/network/bluez/install @@ -5,18 +5,19 @@ $SCRIPTS/install dbus $SCRIPTS/install glib $SCRIPTS/install gettext-dummy -$SCRIPTS/install setserial +$SCRIPTS/install alsa-lib PKG_DIR=`find $PACKAGES -type d -name $1` -mkdir -p $INSTALL/usr/bin -cp $PKG_BUILD/src/.libs/bluetoothd $INSTALL/usr/bin -cp $PKG_BUILD/tools/.libs/hciattach $INSTALL/usr/bin +mkdir -p $INSTALL/usr/sbin +cp $PKG_BUILD/src/.libs/bluetoothd $INSTALL/usr/sbin if [ $DEVTOOLS = yes ]; then + mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/tools/.libs/avinfo $INSTALL/usr/bin cp $PKG_BUILD/tools/.libs/bccmd $INSTALL/usr/bin cp $PKG_BUILD/tools/.libs/ciptool $INSTALL/usr/bin + cp $PKG_BUILD/tools/.libs/hciattach $INSTALL/usr/bin cp $PKG_BUILD/tools/.libs/hciconfig $INSTALL/usr/bin cp $PKG_BUILD/tools/hcisecfilter $INSTALL/usr/bin cp $PKG_BUILD/tools/.libs/hcitool $INSTALL/usr/bin @@ -26,8 +27,6 @@ if [ $DEVTOOLS = yes ]; then cp $PKG_BUILD/test/.libs/hciemu $INSTALL/usr/bin fi -cp $PKG_DIR/scripts/* $INSTALL/usr/bin - mkdir -p $INSTALL/usr/lib cp $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib @@ -41,5 +40,5 @@ mkdir -p $INSTALL/etc/dbus-1/system.d cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/etc/udev/rules.d -cp $PKG_BUILD/scripts/bluetooth.rules \ - $INSTALL/etc/udev/rules.d/35_bluetooth.rules +cp $PKG_BUILD/scripts/97_bluetooth.rules \ + $INSTALL/etc/udev/rules.d diff --git a/packages/network/bluez/scripts/bluetooth_serial b/packages/network/bluez/scripts/bluetooth_serial deleted file mode 100755 index 131c5e9c86..0000000000 --- a/packages/network/bluez/scripts/bluetooth_serial +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# bluetooth_serial -# -# Bluetooth serial PCMCIA card initialization -# - -start_serial() -{ - [ -x /usr/bin/setserial -a -x /usr/bin/hciattach ] || return 1 - [ -n "$BAUDBASE" ] && /usr/bin/setserial $DEVNAME baud_base $BAUDBASE - /usr/bin/hciattach $DEVNAME $HCIOPTS 2>&1 -} - -stop_serial() -{ - [ -x /usr/bin/fuser ] || return 1 - /usr/bin/fuser -k -HUP $DEVNAME > /dev/null 2>&1 -} - -case "$ACTION" in - add) - start_serial - ;; - remove) - stop_serial - ;; - *) - ;; -esac