[oe-commits] Jackie Huang : inetutils: use new update-alternatives syntax

git at git.openembedded.org git at git.openembedded.org
Wed Dec 4 21:09:13 UTC 2013


Module: meta-openembedded.git
Branch: master
Commit: 1f88425be74f598ce1e5b3db8375218a6aec1546
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=1f88425be74f598ce1e5b3db8375218a6aec1546

Author: Jackie Huang <jackie.huang at windriver.com>
Date:   Wed Dec  4 18:33:54 2013 +0800

inetutils: use new update-alternatives syntax

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

Signed-off-by: Li Wang <li.wang at windriver.com>
Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
Signed-off-by: Joe MacDonald <joe at deserted.net>

---

 .../inetutils/inetutils_1.9.1.bb                     | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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"



More information about the Openembedded-commits mailing list