From b32f30a0a4b7c9d3da97e88bc9f44c3409083b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 21 May 2021 23:24:30 -0300 Subject: [PATCH] bluez: support configs in service, adopt. Passing options to bluetoothd can be necessary in some cases. Also move INSTALL.msg to README.voidlinux, and note that elogind can be enough, instead of requiring group membership. --- srcpkgs/bluez/INSTALL.msg | 1 - srcpkgs/bluez/files/README.voidlinux | 2 ++ srcpkgs/bluez/files/bluetoothd/run | 3 ++- srcpkgs/bluez/template | 6 ++++-- 4 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 srcpkgs/bluez/INSTALL.msg create mode 100644 srcpkgs/bluez/files/README.voidlinux diff --git a/srcpkgs/bluez/INSTALL.msg b/srcpkgs/bluez/INSTALL.msg deleted file mode 100644 index d253e9cf502b..000000000000 --- a/srcpkgs/bluez/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -You need to be in the bluetooth group to be able to modify the bluetooth state! diff --git a/srcpkgs/bluez/files/README.voidlinux b/srcpkgs/bluez/files/README.voidlinux new file mode 100644 index 000000000000..39943287ed27 --- /dev/null +++ b/srcpkgs/bluez/files/README.voidlinux @@ -0,0 +1,2 @@ +You need to be in the bluetooth group or have elogind enabled +to be able to modify the bluetooth state. diff --git a/srcpkgs/bluez/files/bluetoothd/run b/srcpkgs/bluez/files/bluetoothd/run index 860fa4bf80b3..7457f9e560be 100755 --- a/srcpkgs/bluez/files/bluetoothd/run +++ b/srcpkgs/bluez/files/bluetoothd/run @@ -1,4 +1,5 @@ #!/bin/sh +[ -r ./conf ] && . ./conf sv check dbus >/dev/null || exit 1 exec 2>&1 -exec /usr/libexec/bluetooth/bluetoothd -n +exec /usr/libexec/bluetooth/bluetoothd -n ${OPTS} diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 2130b7340580..723a14183336 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,7 +1,7 @@ # Template file for 'bluez' pkgname=bluez version=5.58 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev --disable-systemd --enable-sixaxis --enable-threads --enable-library --enable-deprecated @@ -11,7 +11,7 @@ hostmakedepends="automake flex libtool pkg-config" makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel readline-devel ell-devel $(vopt_if mesh json-c-devel)" short_desc="Bluetooth tools and daemons" -maintainer="Doan Tran Cong Danh " +maintainer="Érico Nogueira " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://www.bluez.org/" distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz" @@ -41,6 +41,8 @@ post_install() { if [ "$build_option_mesh" ]; then vsv bluetooth-meshd fi + + vdoc ${FILESDIR}/README.voidlinux } libbluetooth_package() {