[meta-oe][rocko][PATCH] gpsd: fix /etc/default/gpsd ALTERNATIVES logic

[meta-oe][rocko][PATCH] gpsd: fix /etc/default/gpsd ALTERNATIVES logic

[Ramon Fried]

From: Martin Kelly <mkelly@xevo.com>

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>
---
 meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb | 5 ++---
 1 file 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 f8e6a2b13..47fed2d97 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"
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [meta-oe][rocko][PATCH] gpsd: fix /etc/default/gpsd ALTERNATIVES logic

[Martin Kelly]

On 12/28/2017 06:56 AM, Ramon Fried wrote:
> From: Martin Kelly <mkelly@xevo.com>
> 
> 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>
> ---
>   meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb | 5 ++---
>   1 file 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 f8e6a2b13..47fed2d97 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"
> 

No objections from me.