diff options
Diffstat (limited to 'source/n')
-rwxr-xr-x | source/n/bluez/bluez.SlackBuild | 15 | ||||
-rw-r--r-- | source/n/bluez/config/uart.conf | 6 | ||||
-rw-r--r-- | source/n/bluez/doinst.sh | 1 |
3 files changed, 8 insertions, 14 deletions
diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild index 069f952d6..08de3c809 100755 --- a/source/n/bluez/bluez.SlackBuild +++ b/source/n/bluez/bluez.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bluez VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -138,12 +138,8 @@ cp -a $CWD/config/org.bluez.obex.service $PKG/usr/share/dbus-1/services chown root:root $PKG/usr/share/dbus-1/services/org.bluez.obex.service chmod 644 $PKG/usr/share/dbus-1/services/org.bluez.obex.service -# Install the configuration files -mkdir -p $PKG/etc/bluetooth $PKG/etc/default -cat src/main.conf > $PKG/etc/bluetooth/main.conf.new -cat profiles/input/input.conf > $PKG/etc/bluetooth/input.conf.new -cat profiles/network/network.conf > $PKG/etc/bluetooth/network.conf.new -cat $CWD/config/uart.conf > $PKG/etc/bluetooth/uart.conf.new +# Install default options config file: +mkdir -p $PKG/etc/default cat $CWD/config/defaultconfig > $PKG/etc/default/bluetooth.new # Add an init script @@ -154,6 +150,11 @@ cat $CWD/config/rc.bluetooth > $PKG/etc/rc.d/rc.bluetooth.new # script is not executable: chmod 755 $PKG/etc/rc.d/rc.bluetooth.new +# Make the other config files .new: +for config in input.conf main.conf network.conf ; do + mv $PKG/etc/bluetooth/${config} $PKG/etc/bluetooth/${config}.new +done + # If the deprecated utility gatttool was built, go ahead and install it: if [ -x attrib/gatttool ]; then cp attrib/gatttool $PKG/usr/bin diff --git a/source/n/bluez/config/uart.conf b/source/n/bluez/config/uart.conf deleted file mode 100644 index b2e276f4e..000000000 --- a/source/n/bluez/config/uart.conf +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/bluetooth/uart.conf - -# Attach serial devices via UART HCI to BlueZ stack -# Use one line per device -# See the hciattach man page for options - diff --git a/source/n/bluez/doinst.sh b/source/n/bluez/doinst.sh index 796630fd2..bd2e052b0 100644 --- a/source/n/bluez/doinst.sh +++ b/source/n/bluez/doinst.sh @@ -21,6 +21,5 @@ config etc/rc.d/rc.bluetooth.new config etc/bluetooth/input.conf.new config etc/bluetooth/main.conf.new config etc/bluetooth/network.conf.new -config etc/bluetooth/uart.conf.new config etc/default/bluetooth.new |