summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-03-12 16:07:21 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-18 11:12:26 +0000
commite2a47ca54b78a9478086c0ffd62af9518de0b829 (patch)
tree43f7ecdc23ff7a3d7b522294d4605698d8190692
parent2f6d48ae880c50f5da05c4581e8dce42ae31b16c (diff)
downloadpoky-e2a47ca54b78a9478086c0ffd62af9518de0b829.tar.gz
inetutils: Handle rsh, etc more consistently
- We cannot build rsh, rshd, rlogind and rcp on musl. This is handled gracefully in the configure scripts and spelled out with EXTRA_OECONF. Expand this to include rexec to cover all of the related functionality. - Rework adding in the xinetd.d files for these services to only do so when we even have the services being built. This leads to no rsh/rshd sub-packages on musl at all. - If we use the normal alternatives mechanism to allow for this or netkit-rsh to provide rsh/rshd functionality we end up with QA issues on musl as we have unused ALTERNATIVES logic. Switch to making use of RPROVIDES / RCONFLICTS logic instead and make it match the netkit-rsh packaging names. Cc: Khem Raj <raj.khem@gmail.com> (From OE-Core rev: 4bd1a09c47de49d78cc85d849e53d4661831870b) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb32
1 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
index 9318d12309..4aa350947a 100644
--- a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
+++ b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
@@ -49,7 +49,7 @@ EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \
49 --enable-rpath=no \ 49 --enable-rpath=no \
50" 50"
51 51
52EXTRA_OECONF_append_libc-musl = " --disable-rsh --disable-rcp --disable-rlogin " 52EXTRA_OECONF_append_libc-musl = " --disable-rsh --disable-rcp --disable-rlogin --disable-rexec --disable-rexecd"
53 53
54do_configure_prepend () { 54do_configure_prepend () {
55 export HELP2MAN='true' 55 export HELP2MAN='true'
@@ -72,21 +72,23 @@ do_install_append () {
72 mv ${D}${libexecdir}/syslogd ${D}${base_sbindir}/ 72 mv ${D}${libexecdir}/syslogd ${D}${base_sbindir}/
73 mv ${D}${libexecdir}/tftpd ${D}${sbindir}/in.tftpd 73 mv ${D}${libexecdir}/tftpd ${D}${sbindir}/in.tftpd
74 mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd 74 mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd
75 mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd 75 if [ -e ${D}${libexecdir}/rexecd ]; then
76 mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd
77 cp ${WORKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec
78 fi
76 if [ -e ${D}${libexecdir}/rlogind ]; then 79 if [ -e ${D}${libexecdir}/rlogind ]; then
77 mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind 80 mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind
81 cp ${WORKDIR}/rlogin.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rlogin
78 fi 82 fi
79 if [ -e ${D}${libexecdir}/rshd ]; then 83 if [ -e ${D}${libexecdir}/rshd ]; then
80 mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd 84 mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd
85 cp ${WORKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh
81 fi 86 fi
82 if [ -e ${D}${libexecdir}/talkd ]; then 87 if [ -e ${D}${libexecdir}/talkd ]; then
83 mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd 88 mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd
84 fi 89 fi
85 mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd 90 mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd
86 mv ${D}${libexecdir}/* ${D}${bindir}/ 91 mv ${D}${libexecdir}/* ${D}${bindir}/
87 cp ${WORKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec
88 cp ${WORKDIR}/rlogin.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rlogin
89 cp ${WORKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh
90 cp ${WORKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet 92 cp ${WORKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet
91 cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd 93 cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd
92 94
@@ -132,15 +134,6 @@ ALTERNATIVE_${PN}-telnetd = "telnetd"
132ALTERNATIVE_LINK_NAME[telnetd] = "${sbindir}/telnetd" 134ALTERNATIVE_LINK_NAME[telnetd] = "${sbindir}/telnetd"
133ALTERNATIVE_TARGET[telnetd] = "${sbindir}/in.telnetd" 135ALTERNATIVE_TARGET[telnetd] = "${sbindir}/in.telnetd"
134 136
135ALTERNATIVE_${PN}-rsh = "rcp rexec rlogin rsh"
136ALTERNATIVE_${PN}-rshd = "rshd rexecd rlogind"
137ALTERNATIVE_LINK_NAME[rshd] = "${sbindir}/rshd"
138ALTERNATIVE_TARGET[rshd] = "${sbindir}/in.rshd"
139ALTERNATIVE_LINK_NAME[rexecd] = "${sbindir}/rexecd"
140ALTERNATIVE_TARGET[rexecd] = "${sbindir}/in.rexecd"
141ALTERNATIVE_LINK_NAME[rlogind] = "${sbindir}/rlogind"
142ALTERNATIVE_TARGET[rlogind] = "${sbindir}/in.rlogind"
143
144ALTERNATIVE_${PN}-inetd= "inetd" 137ALTERNATIVE_${PN}-inetd= "inetd"
145ALTERNATIVE_${PN}-traceroute = "traceroute" 138ALTERNATIVE_${PN}-traceroute = "traceroute"
146 139
@@ -178,13 +171,20 @@ FILES_${PN}-ftp = "${bindir}/ftp.${BPN}"
178 171
179FILES_${PN}-tftp = "${bindir}/tftp.${BPN}" 172FILES_${PN}-tftp = "${bindir}/tftp.${BPN}"
180FILES_${PN}-telnet = "${bindir}/telnet.${BPN}" 173FILES_${PN}-telnet = "${bindir}/telnet.${BPN}"
181FILES_${PN}-rsh = "${bindir}/rsh.${BPN} ${bindir}/rlogin.${BPN} ${bindir}/rexec.${BPN} ${bindir}/rcp.${BPN}" 174
175# We make us of RCONFLICTS / RPROVIDES here rather than using the normal
176# alternatives method as this leads to packaging QA issues when using
177# musl as that library does not provide what these applications need to
178# build.
179FILES_${PN}-rsh = "${bindir}/rsh ${bindir}/rlogin ${bindir}/rexec ${bindir}/rcp"
180RCONFLICTS_${PN}-rsh += "netkit-rsh-client"
181RPROVIDES_${PN}-rsh = "rsh"
182 182
183FILES_${PN}-rshd = "${sbindir}/in.rshd ${sbindir}/in.rlogind ${sbindir}/in.rexecd \ 183FILES_${PN}-rshd = "${sbindir}/in.rshd ${sbindir}/in.rlogind ${sbindir}/in.rexecd \
184 ${sysconfdir}/xinetd.d/rsh ${sysconfdir}/xinetd.d/rlogin ${sysconfdir}/xinetd.d/rexec" 184 ${sysconfdir}/xinetd.d/rsh ${sysconfdir}/xinetd.d/rlogin ${sysconfdir}/xinetd.d/rexec"
185FILES_${PN}-rshd-dbg = "${sbindir}/.debug/in.rshd ${sbindir}/.debug/in.rlogind ${sbindir}/.debug/in.rexecd" 185FILES_${PN}-rshd-dbg = "${sbindir}/.debug/in.rshd ${sbindir}/.debug/in.rlogind ${sbindir}/.debug/in.rexecd"
186RDEPENDS_${PN}-rshd += "xinetd tcp-wrappers" 186RDEPENDS_${PN}-rshd += "xinetd tcp-wrappers"
187RCONFLICTS_${PN}-rshd += "netkit-rshd" 187RCONFLICTS_${PN}-rshd += "netkit-rshd-server"
188RPROVIDES_${PN}-rshd = "rshd" 188RPROVIDES_${PN}-rshd = "rshd"
189 189
190FILES_${PN}-ftpd = "${bindir}/ftpd.${BPN}" 190FILES_${PN}-ftpd = "${bindir}/ftpd.${BPN}"