Patchwork [meta-networking,1/2] inetutils: fix simple bb rule error

login
register
mail settings
Submitter jackie huang
Date Dec. 4, 2013, 10:33 a.m.
Message ID <1386153235-16411-1-git-send-email-jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/62779/
State Accepted, archived
Delegated to: Joe MacDonald
Headers show

Comments

jackie huang - Dec. 4, 2013, 10:33 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

Correct the usage of alternative link and target:
ALTERNATIVE_LINK_NAME[name] = "target"
ALTERNATIVE_TARGET[name] = "target"

Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../inetutils/inetutils_1.9.1.bb                     | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
Koen Kooi - Dec. 4, 2013, 10:39 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

jackie.huang@windriver.com schreef op 04-12-13 11:33:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> Correct the usage of alternative link and target:

Make the above the summary, 'fix simple bb rule error' is too vague when
looking through the output of 'git log --oneline'
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFSnwZqMkyGM64RGpERAvn8AJwJgmIczTwCWNuTe6TdkiGUyl+kKgCdHrcA
ub+FZU7aXb7K84C447kCCqk=
=6wkg
-----END PGP SIGNATURE-----
Joe MacDonald - Dec. 4, 2013, 1:49 p.m.
[Re: [oe] [meta-networking][PATCH 1/2] inetutils: fix simple bb rule error] On 13.12.04 (Wed 11:39) Koen Kooi wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> jackie.huang@windriver.com schreef op 04-12-13 11:33:
> > From: Jackie Huang <jackie.huang@windriver.com>
> > 
> > Correct the usage of alternative link and target:
> 
> Make the above the summary, 'fix simple bb rule error' is too vague when
> looking through the output of 'git log --oneline'

Agreed.  If there's no objection, I'll change this to:

inetutils: use new update-alternatives syntax

Though that does tend to render the rest of the commit log redundant.
:-)

-J.

> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
> Comment: GPGTools - http://gpgtools.org
> 
> iD8DBQFSnwZqMkyGM64RGpERAvn8AJwJgmIczTwCWNuTe6TdkiGUyl+kKgCdHrcA
> ub+FZU7aXb7K84C447kCCqk=
> =6wkg
> -----END PGP SIGNATURE-----
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Joe MacDonald - Dec. 4, 2013, 9:10 p.m.
[Re: [oe] [meta-networking][PATCH 1/2] inetutils: fix simple bb rule error] On 13.12.04 (Wed 08:49) Joe MacDonald wrote:

> [Re: [oe] [meta-networking][PATCH 1/2] inetutils: fix simple bb rule error] On 13.12.04 (Wed 11:39) Koen Kooi wrote:
> 
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> > 
> > jackie.huang@windriver.com schreef op 04-12-13 11:33:
> > > From: Jackie Huang <jackie.huang@windriver.com>
> > > 
> > > Correct the usage of alternative link and target:
> > 
> > Make the above the summary, 'fix simple bb rule error' is too vague when
> > looking through the output of 'git log --oneline'
> 
> Agreed.  If there's no objection, I'll change this to:
> 
> inetutils: use new update-alternatives syntax
> 
> Though that does tend to render the rest of the commit log redundant.
> :-)

Okay, I went ahead and merged what I suggested I would.  I'm seeing QA
issues with bad RPATH values, but those don't appear to be new, so I'll
look at them separately.

-J.

> 
> -J.
> 
> > -----BEGIN PGP SIGNATURE-----
> > Version: GnuPG v1.4.5 (Darwin)
> > Comment: GPGTools - http://gpgtools.org
> > 
> > iD8DBQFSnwZqMkyGM64RGpERAvn8AJwJgmIczTwCWNuTe6TdkiGUyl+kKgCdHrcA
> > ub+FZU7aXb7K84C447kCCqk=
> > =6wkg
> > -----END PGP SIGNATURE-----
> > 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
jackie huang - Dec. 5, 2013, 2:06 a.m.
On 12/4/2013 9:49 PM, Joe MacDonald wrote:
> [Re: [oe] [meta-networking][PATCH 1/2] inetutils: fix simple bb rule error] On 13.12.04 (Wed 11:39) Koen Kooi wrote:
>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> jackie.huang@windriver.com schreef op 04-12-13 11:33:
>>> From: Jackie Huang <jackie.huang@windriver.com>
>>>
>>> Correct the usage of alternative link and target:
>>
>> Make the above the summary, 'fix simple bb rule error' is too vague when
>> looking through the output of 'git log --oneline'
>
> Agreed.  If there's no objection, I'll change this to:

No objection, thanks!

Thanks,
Jackie

>
> inetutils: use new update-alternatives syntax
>
> Though that does tend to render the rest of the commit log redundant.
> :-)
>
> -J.
>
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1.4.5 (Darwin)
>> Comment: GPGTools - http://gpgtools.org
>>
>> iD8DBQFSnwZqMkyGM64RGpERAvn8AJwJgmIczTwCWNuTe6TdkiGUyl+kKgCdHrcA
>> ub+FZU7aXb7K84C447kCCqk=
>> =6wkg
>> -----END PGP SIGNATURE-----
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Patch

diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
index e371ae5..59a22aa 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
@@ -92,22 +92,22 @@  ALTERNATIVE_${PN}-ftp = "ftp"
 ALTERNATIVE_${PN}-ftpd = "ftpd"
 ALTERNATIVE_${PN}-tftp = "tftp"
 ALTERNATIVE_${PN}-tftpd = "tftpd"
-ALTERNATIVE_LINK_NAME_${PN}-tftpd = "${bindir}/tftpd"
-ALTERNATIVE_TARGET_${PN}-tftpd  = "${sbindir}/in.tftpd"
+ALTERNATIVE_LINK_NAME[tftpd] = "${bindir}/tftpd"
+ALTERNATIVE_TARGET[tftpd]  = "${sbindir}/in.tftpd"
 
 ALTERNATIVE_${PN}-telnet = "telnet"
 ALTERNATIVE_${PN}-telnetd = "telnetd"
-ALTERNATIVE_LINK_NAME_${PN}-telnetd = "${bindir}/telnetd"
-ALTERNATIVE_TARGET_${PN}-telnetd = "${sbindir}/in.telnetd"
+ALTERNATIVE_LINK_NAME[telnetd] = "${bindir}/telnetd"
+ALTERNATIVE_TARGET[telnetd] = "${sbindir}/in.telnetd"
 
 ALTERNATIVE_${PN}-rsh = "rcp rexec rlogin rsh"
 ALTERNATIVE_${PN}-rshd = "rshd rexecd rlogind"
-ALTERNATIVE_LINK_NAME_${PN}-rshd = "${bindir}/rshd"
-ALTERNATIVE_TARGET_${PN}-rshd = "${sbindir}/in.rshd"
-ALTERNATIVE_LINK_NAME_${PN}-rexecd = "${bindir}/rexecd"
-ALTERNATIVE_TARGET_${PN}-rexecd = "${sbindir}/in.rexecd"
-ALTERNATIVE_LINK_NAME_${PN}-rlogind = "${bindir}/rlogind"
-ALTERNATIVE_TARGET_${PN}-rlogind = "${sbindir}/in.rlogind"
+ALTERNATIVE_LINK_NAME[rshd] = "${bindir}/rshd"
+ALTERNATIVE_TARGET[rshd] = "${sbindir}/in.rshd"
+ALTERNATIVE_LINK_NAME[rexecd] = "${bindir}/rexecd"
+ALTERNATIVE_TARGET[rexecd] = "${sbindir}/in.rexecd"
+ALTERNATIVE_LINK_NAME[rlogind] = "${bindir}/rlogind"
+ALTERNATIVE_TARGET[rlogind] = "${sbindir}/in.rlogind"
 
 ALTERNATIVE_${PN}-inetd= "inetd"
 ALTERNATIVE_${PN}-traceroute = "traceroute"