Skip to contentSkip to conversation

gpsd: fix /etc/default/gpsd ALTERNATIVES logic

PATCH In review Ramon Fried 2 participants 2 messages Dec 28, 2017 – Jan 3, 2018

lore
Share & tools
lore

Ramon Fried

author
#0 lore raw

PATCH 1/1 gpsd: fix /etc/default/gpsd ALTERNATIVES logic

From: Martin Kelly <[email protected]>

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 <[email protected]>
Signed-off-by Armin Kuster <[email protected]>
(cherry picked from commit 194f855b44319c7834ba11e6e0a77ef279970a04)
Signed-off-by Ramon Fried <[email protected]>
---
 meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb +2 -3
index f8e6a2b13..47fed2d97 100644
@@ -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"
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#1 lore raw
Quoted 25 lines · Ramon Fried

From: Martin Kelly <[email protected]>

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 <[email protected]>
Signed-off-by Armin Kuster <[email protected]>
(cherry picked from commit 194f855b44319c7834ba11e6e0a77ef279970a04)
Signed-off-by Ramon Fried <[email protected]>
---
  meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb +0 -0
index f8e6a2b13..47fed2d97 100644

meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb SYSTEMD_SERVICE_${PN} = "${PN}.socket" · line 133

Quoted 8 lines
meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb +2 -3
@@ -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"

No objections from me.