Patchwork [1/1] traceroute: rename alternatives name

login
register
mail settings
Submitter Hongxu Jia
Date Feb. 25, 2014, 6:14 a.m.
Message ID <69f299d4f94277fcebacb27c0820b30d27dca4c1.1393308745.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/67375/
State New, archived
Headers show

Comments

Hongxu Jia - Feb. 25, 2014, 6:14 a.m.
Rename traceroute's alternatives name from 'traceroute6' to 'traceroute'.

The 'traceroute6' is equivalent to 'traceroute -6' which means traceroute
in IPv6, and traceroute also supports IPv4. So traceroute6 is part of
traceroute and they are not equivalent.

The Ubuntu 13.04 treated them as two different alternatives name also.
...
$ ls -al /usr/bin/traceroute*
lrwxrwxrwx 1 root root    28 Feb 25 13:31 /usr/bin/traceroute -> /etc/alternatives/traceroute
lrwxrwxrwx 1 root root    29 Oct 22  2012 /usr/bin/traceroute6 -> /etc/alternatives/traceroute6
...

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Martin Jansa - Feb. 26, 2014, 11:11 p.m.
On Tue, Feb 25, 2014 at 02:14:30PM +0800, Hongxu Jia wrote:
> Rename traceroute's alternatives name from 'traceroute6' to 'traceroute'.

Please use [meta-networking] tag in subject so it's easier to filter
them on patchwork to separate bundles.

> 
> The 'traceroute6' is equivalent to 'traceroute -6' which means traceroute
> in IPv6, and traceroute also supports IPv4. So traceroute6 is part of
> traceroute and they are not equivalent.
> 
> The Ubuntu 13.04 treated them as two different alternatives name also.
> ...
> $ ls -al /usr/bin/traceroute*
> lrwxrwxrwx 1 root root    28 Feb 25 13:31 /usr/bin/traceroute -> /etc/alternatives/traceroute
> lrwxrwxrwx 1 root root    29 Oct 22  2012 /usr/bin/traceroute6 -> /etc/alternatives/traceroute6
> ...
> 
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>  meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> index e6718db..83ac5a7 100644
> --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> @@ -39,5 +39,5 @@ do_install() {
>  
>  }
>  
> -ALTERNATIVE_${PN} = "traceroute6"
> -ALTERNATIVE_LINK_NAME[traceroute6] = "${bindir}/traceroute"
> +ALTERNATIVE_${PN} = "traceroute"
> +ALTERNATIVE_LINK_NAME[traceroute] = "${bindir}/traceroute"
> -- 
> 1.8.1.2
>

Patch

diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
index e6718db..83ac5a7 100644
--- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
+++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
@@ -39,5 +39,5 @@  do_install() {
 
 }
 
-ALTERNATIVE_${PN} = "traceroute6"
-ALTERNATIVE_LINK_NAME[traceroute6] = "${bindir}/traceroute"
+ALTERNATIVE_${PN} = "traceroute"
+ALTERNATIVE_LINK_NAME[traceroute] = "${bindir}/traceroute"