]> code.ossystems Code Review - openembedded-core.git/commitdiff
inetutils: fix wrong package name
authorChangqing Li <changqing.li@windriver.com>
Wed, 29 May 2019 07:46:30 +0000 (15:46 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 30 May 2019 11:34:56 +0000 (12:34 +0100)
fix below error:
file /etc/xinetd.d/telnet conflicts between attempted installs of netkit-telnet-0.17-r0.i586 and inetutils-telnetd-1.9.4-r0.i586
file /usr/sbin/in.telnetd conflicts between attempted installs of netkit-telnet-0.17-r0.i586 and inetutils-telnetd-1.9.4-r0.i586

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb

index ec1384eabd3a6bd6e428498a351522f2058c9a72..ac2e017d8b5f06a3d8c755ccb2d7655389be5030 100644 (file)
@@ -200,7 +200,7 @@ RDEPENDS_${PN}-tftpd += "xinetd"
 
 FILES_${PN}-telnetd = "${sbindir}/in.telnetd ${sysconfdir}/xinetd.d/telnet"
 FILES_${PN}-telnetd-dbg = "${sbindir}/.debug/in.telnetd"
-RCONFLICTS_${PN}-telnetd += "netkit-telnetd"
+RCONFLICTS_${PN}-telnetd += "netkit-telnet"
 RPROVIDES_${PN}-telnetd = "telnetd"
 RDEPENDS_${PN}-telnetd += "xinetd"