Skip to content

Commit 9d5443c

Browse files
committed
refactor(wifi-commissioning): remove sed workarounds, bump SRCREV
SocketGroup, SupplementaryGroups, and Requires=bluetooth are now hardcoded in the upstream unit files. Recipe only patches for bluetooth-absent builds. Signed-off-by: Jan Zachmann <50990105+JanZachmann@users.noreply.github.com>
1 parent 4b25d42 commit 9d5443c

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

recipes-omnect/wifi-commissioning-service/wifi-commissioning-service.inc

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,9 @@ do_install:append() {
2727
install -m 0644 ${S}/systemd/wifi-commissioning-service@.service ${D}${systemd_system_unitdir}/
2828
install -m 0644 ${S}/systemd/wifi-commissioning-service@.socket ${D}${systemd_system_unitdir}/
2929

30-
# Set socket group to omnect_device_service_client (GID 10000) so containers
31-
# can access the socket via their primary group — same pattern as omnect-device-service
32-
sed -i 's/^SocketGroup=wpa_supplicant$/SocketGroup=omnect_device_service_client/' \
33-
${D}${systemd_system_unitdir}/wifi-commissioning-service@.socket
34-
35-
# Add wpa_supplicant as supplementary group so the service can access
36-
# wpa_supplicant's control socket at /var/run/wpa_supplicant/<iface>
37-
sed -i '/^Group=wifi_commissioning$/a SupplementaryGroups=wpa_supplicant' \
38-
${D}${systemd_system_unitdir}/wifi-commissioning-service@.service
39-
4030
# When bluetooth is absent: remove bluetooth deps and disable BLE transport
4131
if [ "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'yes', 'no', d)}" = "no" ]; then
42-
sed -i '/^Wants=bluetooth.service$/d' \
32+
sed -i '/^Requires=bluetooth.service$/d' \
4333
${D}${systemd_system_unitdir}/wifi-commissioning-service@.service
4434
sed -i '/^After=bluetooth.service$/d' \
4535
${D}${systemd_system_unitdir}/wifi-commissioning-service@.service

recipes-omnect/wifi-commissioning-service/wifi-commissioning-service_0.1.0.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ inherit cargo
88
# how to get wifi-commissioning-service could be as easy as but default to a git checkout:
99
# SRC_URI += "crate://crates.io/wifi-commissioning-service/0.1.0"
1010
SRC_URI += "git://github.com/janzachmann/wifi-commissioning-service.git;protocol=https;nobranch=1;branch=rewrite/v2"
11-
SRCREV = "10db33fc8a020498fa9e4f1d4c63bce94863d770"
11+
SRCREV = "fe280dda618ec201bbf21e1bb22c44b2c2d2e215"
1212
S = "${WORKDIR}/git"
1313
CARGO_SRC_DIR = ""
1414

0 commit comments

Comments
 (0)