fixes
This commit is contained in:
1 parent
b89e064a9c
commit
0a2dd998d1
3 files changed
+92
-9
No files matched your search
@@ -0,0 +1,12 @@
|
|||||||
|
#!/sbin/openrc-run
|
||||||
|
supervisor=supervise-daemon
|
||||||
|
|
||||||
|
name="Bluetooth"
|
||||||
|
description="Bluetooth daemon (bluetoothd) service"
|
||||||
|
command="/usr/libexec/bluetooth/bluetoothd"
|
||||||
|
|
||||||
|
depend() {
|
||||||
|
after coldplug udev-postmount
|
||||||
|
need dbus localmount hostname
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
Submitted By: Armin K. <krejzi at email dot com>
|
||||||
|
Date: 2013-04-29
|
||||||
|
Initial Package Version: 5.17
|
||||||
|
Upstream Status: unknown
|
||||||
|
Origin: Arch Linux (Giovanni Campagna)
|
||||||
|
Description: Allow using obexd without systemd in the user session
|
||||||
|
|
||||||
|
Not all sessions run systemd --user (actually, the majority
|
||||||
|
doesn't), so the dbus daemon must be able to spawn obexd
|
||||||
|
directly, and to do so it needs the full path of the daemon.
|
||||||
|
|
||||||
|
Updated for bluez-5.60 on 2021-08-17
|
||||||
|
---
|
||||||
|
Makefile.obexd | 4 ++--
|
||||||
|
obexd/src/org.bluez.obex.service | 4 ----
|
||||||
|
obexd/src/org.bluez.obex.service.in | 4 ++++
|
||||||
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||||
|
delete mode 100644 obexd/src/org.bluez.obex.service
|
||||||
|
create mode 100644 obexd/src/org.bluez.obex.service.in
|
||||||
|
|
||||||
|
diff --git a/Makefile.obexd b/Makefile.obexd
|
||||||
|
index 3760867..142e7c3 100644
|
||||||
|
--- a/Makefile.obexd
|
||||||
|
+++ b/Makefile.obexd
|
||||||
|
@@ -2,12 +2,12 @@
|
||||||
|
if SYSTEMD
|
||||||
|
systemduserunitdir = $(SYSTEMD_USERUNITDIR)
|
||||||
|
systemduserunit_DATA = obexd/src/obex.service
|
||||||
|
+endif
|
||||||
|
|
||||||
|
dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
|
||||||
|
dbussessionbus_DATA = obexd/src/org.bluez.obex.service
|
||||||
|
-endif
|
||||||
|
|
||||||
|
-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
|
||||||
|
+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
|
||||||
|
|
||||||
|
obex_plugindir = $(libdir)/obex/plugins
|
||||||
|
|
||||||
|
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
|
||||||
|
deleted file mode 100644
|
||||||
|
index a538088..0000000
|
||||||
|
--- a/obexd/src/org.bluez.obex.service
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,4 +0,0 @@
|
||||||
|
-[D-BUS Service]
|
||||||
|
-Name=org.bluez.obex
|
||||||
|
-Exec=/bin/false
|
||||||
|
-SystemdService=dbus-org.bluez.obex.service
|
||||||
|
diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..9c815f2
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/obexd/src/org.bluez.obex.service.in
|
||||||
|
@@ -0,0 +1,4 @@
|
||||||
|
+[D-BUS Service]
|
||||||
|
+Name=org.bluez.obex
|
||||||
|
+Exec=@libexecdir@/obexd
|
||||||
|
+SystemdService=dbus-org.bluez.obex.service
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
|
|
||||||
@@ -8,17 +8,23 @@ description='Daemons for the bluetooth protocol stack'
|
|||||||
email='akarsu@protonmail.com'
|
email='akarsu@protonmail.com'
|
||||||
maintainer='akarsu'
|
maintainer='akarsu'
|
||||||
license=('GPLv2')
|
license=('GPLv2')
|
||||||
source=("https://www.kernel.org/pub/linux/bluetooth/bluez-${version}.tar.xz" "https://www.linuxfromscratch.org/patches/blfs/svn/bluez-${veraion}-obexd_without_systemd-1.patch")
|
source=("https://www.kernel.org/pub/linux/bluetooth/bluez-${version}.tar.xz"
|
||||||
|
"bluez-5.66-obexd_without_systemd-1.patch"
|
||||||
|
"bluetoot.initd")
|
||||||
depends=(glib)
|
depends=(glib)
|
||||||
makedepends=(dbus libical json-c alsa-lib ell )
|
makedepends=(dbus libical json-c alsa-lib ell)
|
||||||
md5sums=('3f9496fedf878fba985e56713ed7752e' '62962daa1b19bbcc2db10b7bfd531ea6')
|
md5sums=('3f9496fedf878fba985e56713ed7752e'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP')
|
||||||
group=(net.wireless)
|
group=(net.wireless)
|
||||||
uses=()
|
uses=()
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
|
|
||||||
cd $name-$version
|
cd $name-$version
|
||||||
|
|
||||||
patch -Np1 -i ../bluez-5.66-obexd_without_systemd-1.patch
|
prepare(){
|
||||||
|
patch -Np1 -i ../bluez-5.66-obexd_without_systemd-1.patch
|
||||||
|
}
|
||||||
|
|
||||||
setup(){
|
setup(){
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
@@ -36,9 +42,11 @@ build(){
|
|||||||
|
|
||||||
package (){
|
package (){
|
||||||
make install $jobs
|
make install $jobs
|
||||||
ln -svf ../libexec/bluetooth/bluetoothd /usr/sbin
|
install -v -dm755 $DESTDIR/usr/sbin
|
||||||
install -v -dm755 /etc/bluetooth
|
ln -svf ../libexec/bluetooth/bluetoothd $DESTDIR/usr/sbin/bluetoothd
|
||||||
install -v -m644 src/main.conf /etc/bluetooth/main.conf
|
install -v -dm755 $DESTDIR/etc/bluetooth
|
||||||
install -v -dm755 /usr/share/doc/bluez-5.66
|
install -v -m644 src/main.conf $DESTDIR/etc/bluetooth/main.conf
|
||||||
install -v -m644 doc/*.txt /usr/share/doc/bluez-5.66
|
install -v -dm755 $DESTDIR/usr/share/doc/
|
||||||
|
install -v -dm755 $DESTDIR/usr/share/doc/bluez-5.66
|
||||||
|
install -v -m644 doc/*.txt $DESTDIR/usr/share/doc/bluez-5.66
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user