[meta-networking] traceroute: Remove bashisms

Submitted by Morgan Little on Dec. 21, 2012, 9:23 p.m.

Details

Message ID 1356124984-19927-1-git-send-email-morgan.little@windriver.com
State Rejected
Headers show

Commit Message

Morgan Little Dec. 21, 2012, 9:23 p.m.
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
 meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

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 719d9fb..d855c67 100644
--- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
+++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
@@ -32,10 +32,8 @@  do_install() {
 
     install -d ${D}${mandir}
     install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
-    pushd ${D}${mandir}
-    ln -s ${PN}.8 ${PN}6.8
-    ln -s ${PN}.8 tcptraceroute.8
-    popd
+    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}${PN}6.8
+    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}tcptraceroute.8
 
 }
 

Comments

Martin Jansa Dec. 21, 2012, 9:37 p.m.
On Fri, Dec 21, 2012 at 10:23 PM, Morgan Little
<morgan.little@windriver.com> wrote:
> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> ---
>  meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 6 ++----
>  1 file changed, 2 insertions(+), 4 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 719d9fb..d855c67 100644
> --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> @@ -32,10 +32,8 @@ do_install() {
>
>      install -d ${D}${mandir}
>      install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
> -    pushd ${D}${mandir}
> -    ln -s ${PN}.8 ${PN}6.8
> -    ln -s ${PN}.8 tcptraceroute.8
> -    popd
> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}${PN}6.8
> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}tcptraceroute.8

Thanks for quick reply and fix, but I think this should be:
> +    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
> +    ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8

${D} path won't be valid on target and missing slash after mandir

And is there something referencing those man pages with different
name? Or why are those symlinks provided?

Cheers,
Morgan Little Dec. 21, 2012, 10:02 p.m.
On 12/21/2012 04:37 PM, Martin Jansa wrote:
> On Fri, Dec 21, 2012 at 10:23 PM, Morgan Little
> <morgan.little@windriver.com> wrote:
>> Signed-off-by: Morgan Little <morgan.little@windriver.com>
>> ---
>>  meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 6 ++----
>>  1 file changed, 2 insertions(+), 4 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 719d9fb..d855c67 100644
>> --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
>> +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
>> @@ -32,10 +32,8 @@ do_install() {
>>
>>      install -d ${D}${mandir}
>>      install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
>> -    pushd ${D}${mandir}
>> -    ln -s ${PN}.8 ${PN}6.8
>> -    ln -s ${PN}.8 tcptraceroute.8
>> -    popd
>> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}${PN}6.8
>> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}tcptraceroute.8
>
> Thanks for quick reply and fix, but I think this should be:
>> +    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
>> +    ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8
>
> ${D} path won't be valid on target and missing slash after mandir
It looks like it should be. Thank you for noticing that.
>
> And is there something referencing those man pages with different
> name? Or why are those symlinks provided?
I provided them because I was basing the do_install step off of the .spec file the Fedora uses in their RPM file. It does a similar symlink step. I believe that is can be removed.

//Morgan
>
> Cheers,
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Martin Jansa Jan. 9, 2013, 2:22 p.m.
On Fri, Dec 21, 2012 at 10:02:28PM +0000, Little, Morgan wrote:
> On 12/21/2012 04:37 PM, Martin Jansa wrote:
> > On Fri, Dec 21, 2012 at 10:23 PM, Morgan Little
> > <morgan.little@windriver.com> wrote:
> >> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> >> ---
> >>  meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 6 ++----
> >>  1 file changed, 2 insertions(+), 4 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 719d9fb..d855c67 100644
> >> --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> >> +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> >> @@ -32,10 +32,8 @@ do_install() {
> >>
> >>      install -d ${D}${mandir}
> >>      install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
> >> -    pushd ${D}${mandir}
> >> -    ln -s ${PN}.8 ${PN}6.8
> >> -    ln -s ${PN}.8 tcptraceroute.8
> >> -    popd
> >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}${PN}6.8
> >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}tcptraceroute.8
> >
> > Thanks for quick reply and fix, but I think this should be:
> >> +    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
> >> +    ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8
> >
> > ${D} path won't be valid on target and missing slash after mandir
> It looks like it should be. Thank you for noticing that.
> >
> > And is there something referencing those man pages with different
> > name? Or why are those symlinks provided?
> I provided them because I was basing the do_install step off of the .spec file the Fedora uses in their RPM file. It does a similar symlink step. I believe that is can be removed.

ping :)
Joe MacDonald Jan. 9, 2013, 2:42 p.m.
[Re: [oe] [meta-networking][PATCH] traceroute: Remove bashisms] On 13.01.09 (Wed 15:22) Martin Jansa wrote:

> On Fri, Dec 21, 2012 at 10:02:28PM +0000, Little, Morgan wrote:
> > On 12/21/2012 04:37 PM, Martin Jansa wrote:
> > > On Fri, Dec 21, 2012 at 10:23 PM, Morgan Little
> > > <morgan.little@windriver.com> wrote:
> > >> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> > >> ---
> > >>  meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 6 ++----
> > >>  1 file changed, 2 insertions(+), 4 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 719d9fb..d855c67 100644
> > >> --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> > >> +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> > >> @@ -32,10 +32,8 @@ do_install() {
> > >>
> > >>      install -d ${D}${mandir}
> > >>      install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
> > >> -    pushd ${D}${mandir}
> > >> -    ln -s ${PN}.8 ${PN}6.8
> > >> -    ln -s ${PN}.8 tcptraceroute.8
> > >> -    popd
> > >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}${PN}6.8
> > >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}tcptraceroute.8
> > >
> > > Thanks for quick reply and fix, but I think this should be:
> > >> +    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
> > >> +    ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8
> > >
> > > ${D} path won't be valid on target and missing slash after mandir
> > It looks like it should be. Thank you for noticing that.
> > >
> > > And is there something referencing those man pages with different
> > > name? Or why are those symlinks provided?
> > I provided them because I was basing the do_install step off of the .spec file the Fedora uses in their RPM file. It does a similar symlink step. I believe that is can be removed.
> 
> ping :)

I think this belongs to me to finish up now.  I plan to remove them.
I've kept the thread in my inbox so hopefully I can cover all the
comments on it.
Martin Jansa Jan. 17, 2013, 9 p.m.
On Wed, Jan 09, 2013 at 09:42:37AM -0500, Joe MacDonald wrote:
> [Re: [oe] [meta-networking][PATCH] traceroute: Remove bashisms] On 13.01.09 (Wed 15:22) Martin Jansa wrote:
> 
> > On Fri, Dec 21, 2012 at 10:02:28PM +0000, Little, Morgan wrote:
> > > On 12/21/2012 04:37 PM, Martin Jansa wrote:
> > > > On Fri, Dec 21, 2012 at 10:23 PM, Morgan Little
> > > > <morgan.little@windriver.com> wrote:
> > > >> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> > > >> ---
> > > >>  meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 6 ++----
> > > >>  1 file changed, 2 insertions(+), 4 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 719d9fb..d855c67 100644
> > > >> --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> > > >> +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> > > >> @@ -32,10 +32,8 @@ do_install() {
> > > >>
> > > >>      install -d ${D}${mandir}
> > > >>      install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
> > > >> -    pushd ${D}${mandir}
> > > >> -    ln -s ${PN}.8 ${PN}6.8
> > > >> -    ln -s ${PN}.8 tcptraceroute.8
> > > >> -    popd
> > > >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}${PN}6.8
> > > >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}tcptraceroute.8
> > > >
> > > > Thanks for quick reply and fix, but I think this should be:
> > > >> +    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
> > > >> +    ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8
> > > >
> > > > ${D} path won't be valid on target and missing slash after mandir
> > > It looks like it should be. Thank you for noticing that.
> > > >
> > > > And is there something referencing those man pages with different
> > > > name? Or why are those symlinks provided?
> > > I provided them because I was basing the do_install step off of the .spec file the Fedora uses in their RPM file. It does a similar symlink step. I believe that is can be removed.
> > 
> > ping :)
> 
> I think this belongs to me to finish up now.  I plan to remove them.
> I've kept the thread in my inbox so hopefully I can cover all the
> comments on it.

ping2 :)
Joe MacDonald Jan. 18, 2013, 1:53 p.m.
[Re: [oe] [meta-networking][PATCH] traceroute: Remove bashisms] On 12.12.21 (Fri 22:02) Little, Morgan wrote:

> On 12/21/2012 04:37 PM, Martin Jansa wrote:
> > On Fri, Dec 21, 2012 at 10:23 PM, Morgan Little
> > <morgan.little@windriver.com> wrote:
> >> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> >> ---
> >>  meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 6 ++----
> >>  1 file changed, 2 insertions(+), 4 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 719d9fb..d855c67 100644
> >> --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> >> +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> >> @@ -32,10 +32,8 @@ do_install() {
> >>
> >>      install -d ${D}${mandir}
> >>      install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
> >> -    pushd ${D}${mandir}
> >> -    ln -s ${PN}.8 ${PN}6.8
> >> -    ln -s ${PN}.8 tcptraceroute.8
> >> -    popd
> >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}${PN}6.8
> >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}tcptraceroute.8
> >
> > Thanks for quick reply and fix, but I think this should be:
> >> +    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
> >> +    ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8
> >
> > ${D} path won't be valid on target and missing slash after mandir
> It looks like it should be. Thank you for noticing that.

Fixed.  That one's easy.

> >
> > And is there something referencing those man pages with different
> > name? Or why are those symlinks provided?
> I provided them because I was basing the do_install step off of the .spec file the Fedora uses in their RPM file. It does a similar symlink step. I believe that is can be removed.

So, as far as I can tell, the links are provided to support
/etc/alternatives/ versions of the manpages in case you've got an
alternative implementation of traceroute/traceroute6/etc. on your
system.  Unless you think the links are adding unnecessary clutter, I'm
inclined to leave them even though I honestly have never installed an
alternative traceroute and never looked into why I might want to.

-J.

> 
> //Morgan
> >
> > Cheers,
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Martin Jansa Jan. 18, 2013, 2:17 p.m.
On Fri, Jan 18, 2013 at 08:53:01AM -0500, Joe MacDonald wrote:
> [Re: [oe] [meta-networking][PATCH] traceroute: Remove bashisms] On 12.12.21 (Fri 22:02) Little, Morgan wrote:
> 
> > On 12/21/2012 04:37 PM, Martin Jansa wrote:
> > > On Fri, Dec 21, 2012 at 10:23 PM, Morgan Little
> > > <morgan.little@windriver.com> wrote:
> > >> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> > >> ---
> > >>  meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 6 ++----
> > >>  1 file changed, 2 insertions(+), 4 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 719d9fb..d855c67 100644
> > >> --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> > >> +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> > >> @@ -32,10 +32,8 @@ do_install() {
> > >>
> > >>      install -d ${D}${mandir}
> > >>      install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
> > >> -    pushd ${D}${mandir}
> > >> -    ln -s ${PN}.8 ${PN}6.8
> > >> -    ln -s ${PN}.8 tcptraceroute.8
> > >> -    popd
> > >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}${PN}6.8
> > >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}tcptraceroute.8
> > >
> > > Thanks for quick reply and fix, but I think this should be:
> > >> +    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
> > >> +    ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8
> > >
> > > ${D} path won't be valid on target and missing slash after mandir
> > It looks like it should be. Thank you for noticing that.
> 
> Fixed.  That one's easy.

Great, thanks I'll reenable it in world build when it's pushed.

> > >
> > > And is there something referencing those man pages with different
> > > name? Or why are those symlinks provided?
> > I provided them because I was basing the do_install step off of the .spec file the Fedora uses in their RPM file. It does a similar symlink step. I believe that is can be removed.
> 
> So, as far as I can tell, the links are provided to support
> /etc/alternatives/ versions of the manpages in case you've got an
> alternative implementation of traceroute/traceroute6/etc. on your
> system.  Unless you think the links are adding unnecessary clutter, I'm
> inclined to leave them even though I honestly have never installed an
> alternative traceroute and never looked into why I might want to.

I don't mind if they stay. (I'm not using traceroute on my targets).

> -J.
> 
> > 
> > //Morgan
> > >
> > > Cheers,
> > >
> > > _______________________________________________
> > > Openembedded-devel mailing list
> > > Openembedded-devel@lists.openembedded.org
> > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> > 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
> -- 
> -Joe MacDonald.
> :wq



> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Joe MacDonald Jan. 18, 2013, 2:34 p.m.
[Re: [oe] [meta-networking][PATCH] traceroute: Remove bashisms] On 13.01.18 (Fri 15:17) Martin Jansa wrote:

> On Fri, Jan 18, 2013 at 08:53:01AM -0500, Joe MacDonald wrote:
> > [Re: [oe] [meta-networking][PATCH] traceroute: Remove bashisms] On 12.12.21 (Fri 22:02) Little, Morgan wrote:
> > 
> > > On 12/21/2012 04:37 PM, Martin Jansa wrote:
> > > > On Fri, Dec 21, 2012 at 10:23 PM, Morgan Little
> > > > <morgan.little@windriver.com> wrote:
> > > >> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> > > >> ---
> > > >>  meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 6 ++----
> > > >>  1 file changed, 2 insertions(+), 4 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 719d9fb..d855c67 100644
> > > >> --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> > > >> +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> > > >> @@ -32,10 +32,8 @@ do_install() {
> > > >>
> > > >>      install -d ${D}${mandir}
> > > >>      install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
> > > >> -    pushd ${D}${mandir}
> > > >> -    ln -s ${PN}.8 ${PN}6.8
> > > >> -    ln -s ${PN}.8 tcptraceroute.8
> > > >> -    popd
> > > >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}${PN}6.8
> > > >> +    ln -s ${D}${mandir}${PN}.8 ${D}${mandir}tcptraceroute.8
> > > >
> > > > Thanks for quick reply and fix, but I think this should be:
> > > >> +    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
> > > >> +    ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8
> > > >
> > > > ${D} path won't be valid on target and missing slash after mandir
> > > It looks like it should be. Thank you for noticing that.
> > 
> > Fixed.  That one's easy.
> 
> Great, thanks I'll reenable it in world build when it's pushed.

Just pushed.  Thanks for the reminder, Martin.

-J.

> 
> > > >
> > > > And is there something referencing those man pages with different
> > > > name? Or why are those symlinks provided?
> > > I provided them because I was basing the do_install step off of the .spec file the Fedora uses in their RPM file. It does a similar symlink step. I believe that is can be removed.
> > 
> > So, as far as I can tell, the links are provided to support
> > /etc/alternatives/ versions of the manpages in case you've got an
> > alternative implementation of traceroute/traceroute6/etc. on your
> > system.  Unless you think the links are adding unnecessary clutter, I'm
> > inclined to leave them even though I honestly have never installed an
> > alternative traceroute and never looked into why I might want to.
> 
> I don't mind if they stay. (I'm not using traceroute on my targets).
> 
> > -J.
> > 
> > > 
> > > //Morgan
> > > >
> > > > Cheers,
> > > >
> > > > _______________________________________________
> > > > Openembedded-devel mailing list
> > > > Openembedded-devel@lists.openembedded.org
> > > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> > > 
> > > _______________________________________________
> > > Openembedded-devel mailing list
> > > Openembedded-devel@lists.openembedded.org
> > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> > 
> > -- 
> > -Joe MacDonald.
> > :wq
> 
> 
> 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
>