From 5d285bef0f8abd2da720e9f72d6c421d0da87c91 Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Thu, 28 Dec 2017 16:56:58 +0200 Subject: gpsd: fix /etc/default/gpsd ALTERNATIVES logic 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 Signed-off-by: Armin Kuster (cherry picked from commit 194f855b44319c7834ba11e6e0a77ef279970a04) Signed-off-by: Ramon Fried Signed-off-by: Armin Kuster --- meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'meta-oe') diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb index f8e6a2b137..47fed2d976 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" -- cgit 1.2.3-korg