From bc969d3705c45928de8525ef3d2d9d2867311864 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 2 Apr 2014 15:27:25 +0800 Subject: inetutils: add -dbg packages for tftpd, telnetd and rshd The packages tftpd, telnetd and rshd conflict with the ones provided by netkit, so add the corresponding -dbg packages for them to avoid the following confliction between the dbg package of inetutils and netkit: error: file /usr/sbin/.debug/in.rexecd conflicts between attempted installs of inetutils-dbg-1.9.1-r1.0.armv7a_vfp_neon and netkit-rsh-dbg-0.17-r0.0.armv7a_vfp_neon error: file /usr/sbin/.debug/in.telnetd conflicts between attempted installs of inetutils-dbg-1.9.1-r1.0.armv7a_vfp_neon and netkit-telnet-dbg-0.17-r0.0.armv7a_vfp_neon Signed-off-by: Jackie Huang Signed-off-by: Joe MacDonald --- .../recipes-connectivity/inetutils/inetutils_1.9.1.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'meta-networking/recipes-connectivity') 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 e7f19870cb..0e47015c0e 100644 --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb @@ -80,6 +80,12 @@ ${PN}-tftp ${PN}-logger ${PN}-traceroute ${PN}-syslogd \ ${PN}-ftp ${PN}-ftpd ${PN}-tftpd ${PN}-telnet ${PN}-telnetd ${PN}-inetd \ ${PN}-rsh ${PN}-rshd" +# The packages tftpd, telnetd and rshd conflict with the ones +# provided by netkit, so add the corresponding -dbg packages +# for them to avoid the confliction between the dbg package +# of inetutils and netkit. +PACKAGES += "${PN}-tftpd-dbg ${PN}-telnetd-dbg ${PN}-rshd-dbg" + ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = "talk whois" ALTERNATIVE_LINK_NAME[talkd] = "${sbindir}/in.talkd" @@ -141,18 +147,22 @@ FILES_${PN}-rsh = "${bindir}/rsh.${BPN} ${bindir}/rlogin.${BPN} ${bindir}/rexec. FILES_${PN}-rshd = "${sbindir}/in.rshd ${sbindir}/in.rlogind ${sbindir}/in.rexecd \ ${sysconfdir}/xinetd.d/rsh ${sysconfdir}/xinetd.d/rlogin ${sysconfdir}/xinetd.d/rexec" +FILES_${PN}-rshd-dbg = "${sbindir}/.debug/in.rshd ${sbindir}/.debug/in.rlogind ${sbindir}/.debug/in.rexecd" RDEPENDS_${PN}-rshd += "xinetd tcp-wrappers" RCONFLICTS_${PN}-rshd += "netkit-rshd" RPROVIDES_${PN}-rshd = "rshd" FILES_${PN}-ftpd = "${bindir}/ftpd.${BPN}" +FILES_${PN}-ftpd-dbg = "${bindir}/.debug/ftpd.${BPN}" RDEPENDS_${PN}-ftpd += "xinetd" FILES_${PN}-tftpd = "${sbindir}/in.tftpd ${sysconfdir}/xinetd.d/tftpd" +FILES_${PN}-tftpd-dbg = "${sbindir}/.debug/in.tftpd" RCONFLICTS_${PN}-tftpd += "netkit-tftpd" 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" RPROVIDES_${PN}-telnetd = "telnetd" RDEPENDS_${PN}-telnetd += "xinetd" -- cgit 1.2.3-korg