feat: replace wifi-commissioning-gatt-service with wifi-commissioning-service

README.md

@@ -32,10 +32,10 @@ Depending on `MACHINE_FEATURES` we also set `3g`, `bluetooth` and `wifi`.
     - please see section [Flash Modes](#flash-modes) below
 - `resize-data`
     - expands the data partition to available space on first boot
-- [`wifi-commissioning`](https://github.com/omnect/wifi-commissioning-gatt-service.git)
-    - adds a service which enables wifi commissioning via bluetooth
+- [`wifi-commissioning`](https://github.com/janzachmann/wifi-commissioning-service.git)
+    - adds a service which enables wifi commissioning via BLE GATT and/or Unix socket HTTP REST API
     - depends on `DISTRO_FEATURES` `wifi` and `bluetooth` which are not added to `DISTRO_FEATURES` automatically!
-    - **note**: this is only intended for demo purposes; this is not a production ready service
+    - **note**: BLE interface is intended for demo/initial commissioning; the Unix socket API targets programmatic integration but the service is still in early development (v0.1.0)
 
 ### `MACHINE_FEATURES`
 `meta-omnect` extends the following `MACHINE_FEATURES`:

dynamic-layers/raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend

@@ -3,7 +3,7 @@ do_install:append () {
     # Error: Error { kind: Internal(DBus("org.freedesktop.DBus.Error.UnknownMethod")), message: "Method \"RegisterAdvertisement\" with signature \"oa{sv}\" on interface \"org.bluez.LEAdvertisingManager1\" doesn't exist\n" }
     # only a restart of bluetooth helps
     if ${@bb.utils.contains('DISTRO_FEATURES', 'wifi-commissioning', 'true', 'false', d)}; then
-        sed -i -e 's/^ConditionPathIsDirectory=\(.*\)$/ConditionPathIsDirectory=\1\nPartOf=wifi-commissioning-gatt@wlan0.service/' \
+        sed -i -e 's/^ConditionPathIsDirectory=\(.*\)$/ConditionPathIsDirectory=\1\nPartOf=wifi-commissioning-service@wlan0.service/' \
         ${D}${systemd_system_unitdir}/bluetooth.service
     fi
 }

recipes-omnect/images/omnect-os-image.bb

@@ -60,7 +60,7 @@ IMAGE_INSTALL = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'efi-secure-boot', ' mokutil', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'iotedge', ' aziot-edged iotedge kernel-modules', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd-bash-completion', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi-commissioning', ' wifi-commissioning-gatt-service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi-commissioning', ' wifi-commissioning-service', '', d)} \
     ${CORE_IMAGE_BASE_INSTALL} \
     bootloader-env \
     bootloader-versioned \