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
This commit is contained in:
Alexandre Bard 2021-08-25 11:01:04 +02:00 committed by Gitea
parent 26e480a6e0
commit 29d4398168
1 changed files with 8 additions and 9 deletions

View File

@ -5,16 +5,15 @@ USBAUTO_STATE = "false"
do_install_append () { do_install_append () {
sed -i 's|DEVICES=""|DEVICES="${TTY_DEVICE}"|g' ${D}/etc/default/gpsd.default 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 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 # Service is started by gnss-mgr
SYSTEMD_AUTO_ENABLE_am335x-nmhw21 = "disable" SYSTEMD_AUTO_ENABLE = "${@bb.utils.contains("MACHINE_FEATURES", "advanced-gnss", "disable", "enable", d)}"
SYSTEMD_AUTO_ENABLE_imx8-nmhw23 = "disable"