[PATCH 0/1] traceroute: rename alternatives name

[PATCH 0/1] traceroute: rename alternatives name

[Hongxu Jia]

The following changes since commit 8089aa451827cb791c7d795b9899dc152d1ceb66:

  vlc: Fix build with flac-1.3.0 (2014-02-24 10:10:25 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib hongxu/fix-traceroute
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-traceroute

Hongxu Jia (1):
  traceroute: rename alternatives name

 meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
1.8.1.2

[PATCH 1/1] traceroute: rename alternatives name

[Hongxu Jia]

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(-)

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

Re: [PATCH 1/1] traceroute: rename alternatives name

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1634 bytes --]

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
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]