bluez: included obexctl if libical is installed
This commit is contained in:
parent
0f38ba1d93
commit
c5f563a524
@ -32,9 +32,8 @@ drwxr-xr-x root/root usr/include/bluetooth/
|
||||
-rw-r--r-- root/root usr/include/bluetooth/sdp.h
|
||||
-rw-r--r-- root/root usr/include/bluetooth/sdp_lib.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/bluez/
|
||||
drwxr-xr-x root/root usr/lib/bluez/bluetooth/
|
||||
-rwxr-xr-x root/root usr/lib/bluez/bluetooth/bluetoothd
|
||||
drwxr-xr-x root/root usr/lib/bluetooth/
|
||||
-rwxr-xr-x root/root usr/lib/bluetooth/bluetoothd
|
||||
-rwxr-xr-x root/root usr/lib/libbluetooth.la
|
||||
lrwxrwxrwx root/root usr/lib/libbluetooth.so -> libbluetooth.so.3.19.3
|
||||
lrwxrwxrwx root/root usr/lib/libbluetooth.so.3 -> libbluetooth.so.3.19.3
|
||||
|
@ -1,6 +1,6 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF38eRlP+vjWmAyF0dNmHAtCuhKICyu2kV4yyQEEA4xhcOamWMaxXRsNC7ztSJK8LeQsdxqsg9JtZw5MNwg7m7Sww=
|
||||
SHA256 (Pkgfile) = d0c8c65894a2101eb561ad531789187421acd85107c35379e589c7139d4d1181
|
||||
SHA256 (.footprint) = 9ce1c7aec4e568163602e26d8351b4e66c428c7e39bfa2a800bb70c112e3458a
|
||||
RWSagIOpLGJF36WrE+6HcJ+KSFpQnPrJ8mGq5Rx0Z/HvaBKHAQ3AKTETpkGqhf0DyK1+/8T3iS+vZ0AeCFim5o/pwHx9fO/iag8=
|
||||
SHA256 (Pkgfile) = 7448114bc8a5b9db03e5ccddd6b9bafbbb6f6b7185b8a2cef499dca808ab1c4e
|
||||
SHA256 (.footprint) = 192faea9ae9f6e4225759bf6a01482cbc4efeb3bebcf6b6caec5d24c6b5b0a5e
|
||||
SHA256 (bluez-5.55.tar.xz) = 8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88
|
||||
SHA256 (bluetoothd) = 16992d015e2efe3177ac8a6446225dc724ac0908759015da26d823b9eb5c4ca1
|
||||
SHA256 (bluetoothd) = b24a219ea4b457a8efdd1b5e0880022056b7b85a3e469f5e3678fa5e4d4be6b6
|
||||
|
@ -19,12 +19,13 @@ build() {
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--libexecdir=/usr/lib/$name \
|
||||
--libexecdir=/usr/lib \
|
||||
--enable-{a2dp,experimental,library,midi,tools} \
|
||||
--disable-systemd
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
install -D -m 0644 src/main.conf $PKG/etc/bluetooth/main.conf
|
||||
install -D -m 0755 $SRC/bluetoothd $PKG/etc/rc.d/bluetoothd
|
||||
[[ -e /usr/lib/pkgconfig/libical.pc ]] && install -D -m 0755 tools/obexctl $PKG/usr/lib/bluetooth/obexctl
|
||||
rm -rf $PKG/usr/share/man/man1
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
#@ bluez startup script
|
||||
|
||||
SSD=/sbin/start-stop-daemon
|
||||
PROG=/usr/lib/bluez/bluetooth/bluetoothd
|
||||
PROG=/usr/lib/bluetooth/bluetoothd
|
||||
# OPTS="-d"
|
||||
PID=/var/run/bluetoothd.pid
|
||||
|
||||
|
@ -1,61 +0,0 @@
|
||||
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.
|
||||
---
|
||||
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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user