aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kelly <mkelly@xevo.com>2017-12-28 16:56:58 +0200
committerArmin Kuster <akuster808@gmail.com>2018-01-11 13:26:25 -0800
commit5d285bef0f8abd2da720e9f72d6c421d0da87c91 (patch)
tree1e7a4c20cb7f40713eaa28ccf4240b2e78f003d1
parenta68639ab84762cf878c8c9c65724bb6d98dd52ef (diff)
downloadmeta-openembedded-contrib-stable/rocko-next.zip
meta-openembedded-contrib-stable/rocko-next.tar.gz
meta-openembedded-contrib-stable/rocko-next.tar.bz2
gpsd: fix /etc/default/gpsd ALTERNATIVES logicstable/rocko-next
The ALTERNATIVES logic for the /etc/default/gpsd file is broken, specifying ALTERNATIVE_LINK without brackets. In addition, it refers to ALTERNATIVE_PATH, which update-alternatives.bbclass doesn't use. With this patch, /etc/default/gpsd correctly gets a default link pointing to /etc/default/gpsd.default. Currently, no such link gets created, and gpsd starts off disabled by default since it's missing this config file. Signed-off-by: Martin Kelly <mkelly@xevo.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> (cherry picked from commit 194f855b44319c7834ba11e6e0a77ef279970a04) Signed-off-by: Ramon Fried <rfried@codeaurora.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb
index f8e6a2b..47fed2d 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb
@@ -129,6 +129,5 @@ SYSTEMD_SERVICE_${PN} = "${PN}.socket"
ALTERNATIVE_${PN} = "gpsd-defaults"
-ALTERNATIVE_PATH = "${sysconfdir}/default/gpsd.default"
-ALTERNATIVE_LINK = "${sysconfdir}/default/gpsd"
-ALTERNATIVE_TARGET = "${sysconfdir}/default/gpsd.default"
+ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd"
+ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.default"