From 29d4398168cfe5f19ddcfe6ad37202b088b0dfdf Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Wed, 25 Aug 2021 11:01:04 +0200
Subject: [PATCH] gpsd.bbappend: Use machine features instead of machine
 overrides

With this approach, we just need to change a machine.conf file to add
advanced-gnss to machine_feature in machine.conf to enable gnss-mgr,
force gpsd to start with 115200 bitrate and to disable gpsd service
because it will be started by gnss-mgr.

BugzID: 74458
---
 recipes-navigation/gpsd/gpsd_%.bbappend | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/recipes-navigation/gpsd/gpsd_%.bbappend b/recipes-navigation/gpsd/gpsd_%.bbappend
index 44a0294..4502eff 100644
--- a/recipes-navigation/gpsd/gpsd_%.bbappend
+++ b/recipes-navigation/gpsd/gpsd_%.bbappend
@@ -5,16 +5,15 @@ USBAUTO_STATE = "false"
 do_install_append () {
     sed -i 's|DEVICES=""|DEVICES="${TTY_DEVICE}"|g' ${D}/etc/default/gpsd.default
     sed -i 's|USBAUTO="true"|USBAUTO="${USBAUTO_STATE}"|g' ${D}/etc/default/gpsd.default 
+
+    # gnss-mgr will force the speed to 115200
+    if ${@bb.utils.contains('MACHINE_FEATURES', 'advanced-gnss', 'true', 'false', d)}; then
+        sed -i "s/GPSD_OPTIONS=\"\(.*\)\"/GPSD_OPTIONS=\"\1 -s 115200\"/g" \
+            ${D}${sysconfdir}/default/gpsd.default
+    fi
+
 }
 
-do_install_append_am335x-nmhw21() {
-    sed -i "s/GPSD_OPTIONS=\"\(.*\)\"/GPSD_OPTIONS=\"\1 -s 115200\"/g" ${D}${sysconfdir}/default/gpsd.default
-}
-
-do_install_append_imx8-nmhw23() {
-    sed -i "s/GPSD_OPTIONS=\"\(.*\)\"/GPSD_OPTIONS=\"\1 -s 115200\"/g" ${D}${sysconfdir}/default/gpsd.default
-}
 
 # Service is started by gnss-mgr
-SYSTEMD_AUTO_ENABLE_am335x-nmhw21 = "disable"
-SYSTEMD_AUTO_ENABLE_imx8-nmhw23 = "disable"
+SYSTEMD_AUTO_ENABLE = "${@bb.utils.contains("MACHINE_FEATURES", "advanced-gnss", "disable", "enable", d)}"