summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2018-03-23 15:15:19 -0500
committerJohn Klug <john.klug@multitech.com>2018-03-23 15:15:19 -0500
commit16cd86b22cf53da341b24c46e703a48399bd4eec (patch)
treec3d4525b1d7d93d7c2d113cb9907b47baa7f8386
parent797267d0479fe068e30457cfeefa10800ded4873 (diff)
downloadmeta-mlinux-16cd86b22cf53da341b24c46e703a48399bd4eec.tar.gz
meta-mlinux-16cd86b22cf53da341b24c46e703a48399bd4eec.tar.bz2
meta-mlinux-16cd86b22cf53da341b24c46e703a48399bd4eec.zip
Add init scripts and default file to RFCOMM. Device NAME issue is TBD
-rw-r--r--recipes-connectivity/bluez/bluez5.inc10
-rwxr-xr-xrecipes-connectivity/bluez/bluez5/rfcomm/default2
-rw-r--r--recipes-connectivity/bluez/bluez5/rfcomm/rfcomm.py4
3 files changed, 12 insertions, 4 deletions
diff --git a/recipes-connectivity/bluez/bluez5.inc b/recipes-connectivity/bluez/bluez5.inc
index 601cd6f..c83848a 100644
--- a/recipes-connectivity/bluez/bluez5.inc
+++ b/recipes-connectivity/bluez/bluez5.inc
@@ -8,10 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e"
DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline"
-RDEPENDS_${PN}-pand += "bash"
-DEPENDS_${PN}-pand += "python-dbus python-logging python-syslog"
-RDEPENDS_${PN}-rfcomm += "bash"
-DEPENDS_${PN}-rfcomm += "python-dbus python-logging python-syslog python-glib"
+RDEPENDS_${PN}-pand += "bash python-dbus python-logging python-syslog"
+RDEPENDS_${PN}-rfcomm += "bash python-pygobject python-syslog python-logging python-dbus"
PROVIDES += "bluez-hcidump"
RPROVIDES_${PN} += "bluez-hcidump"
@@ -34,6 +32,8 @@ SRC_URI = "\
file://bt-pan/default \
file://bt-pan/bt-pan \
file://rfcomm/rfcomm.py \
+ file://rfcomm/init \
+ file://rfcomm/default \
"
S = "${WORKDIR}/bluez-${PV}"
@@ -65,6 +65,7 @@ do_install_append() {
install -d ${D}${INIT_D_DIR}
install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth
install -m 0755 ${WORKDIR}/bt-pan/init ${D}${INIT_D_DIR}/bt-pan
+ install -m 0755 ${WORKDIR}/rfcomm/init ${D}${INIT_D_DIR}/rfcomm
install -d ${DBTEXEC}
install -m 0755 ${WORKDIR}/bt-pan/bt-pan ${DBTEXEC}
install -m 0755 ${WORKDIR}/rfcomm/rfcomm.py ${DBTEXEC}/rfcomm
@@ -96,6 +97,7 @@ do_install_append() {
install -d ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/bluetooth
install -m 0644 ${WORKDIR}/bt-pan/default ${D}${sysconfdir}/default/bt-pan
+ install -m 0644 ${WORKDIR}/rfcomm/default ${D}${sysconfdir}/default/rfcomm
install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/
}
diff --git a/recipes-connectivity/bluez/bluez5/rfcomm/default b/recipes-connectivity/bluez/bluez5/rfcomm/default
new file mode 100755
index 0000000..613a72c
--- /dev/null
+++ b/recipes-connectivity/bluez/bluez5/rfcomm/default
@@ -0,0 +1,2 @@
+ENABLED="no"
+RFCOMMOPTS="--debug --login"
diff --git a/recipes-connectivity/bluez/bluez5/rfcomm/rfcomm.py b/recipes-connectivity/bluez/bluez5/rfcomm/rfcomm.py
index 992de45..360f5f4 100644
--- a/recipes-connectivity/bluez/bluez5/rfcomm/rfcomm.py
+++ b/recipes-connectivity/bluez/bluez5/rfcomm/rfcomm.py
@@ -306,6 +306,10 @@ class Profile(dbus.service.Object):
fp_localdir = BLUEZLIB + '/' + localdir # Full path
lg.debug('Localdir: %s' % (fp_localdir))
if os.path.isdir(fp_localdir) and localdir.count(':') == 5:
+ # TBD !!!!!
+ # Look for fp_localdir + address/info or
+ # fp_localdir + 'cache' + address
+ # or get this from bluez somehow using an unknown API.
lg.debug('Localdir is directory and 5 colons: %s' % (fp_localdir))
# We have MAC address
for clientdir in os.listdir(fp_localdir):