aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-12-14 18:09:35 -0800
committerArmin Kuster <akuster808@gmail.com>2017-02-24 19:33:29 +0000
commitb53fe10e0275dc8ec41a8acd27032d0cf1f43122 (patch)
tree4ad1e25c3e6787ae7733a52085f06b403d020eee
parentfae7d92ab987aa557709acc38dda82469ab5dfbc (diff)
downloadmeta-openembedded-contrib-b53fe10e0275dc8ec41a8acd27032d0cf1f43122.tar.gz
meta-openembedded-contrib-b53fe10e0275dc8ec41a8acd27032d0cf1f43122.tar.bz2
meta-openembedded-contrib-b53fe10e0275dc8ec41a8acd27032d0cf1f43122.zip
inetutils: Disable rsh, rcp, rlogin on musl
They all need rcmd() API from rpc implementation and while glibc provides it bundled, musl does not so we disable these apps Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> (cherry picked from commit 3773725982e9160d7ddf20c3a8e31fd6fa04c549) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb19
1 files changed, 15 insertions, 4 deletions
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
index a35e0b4a70..a8c40254ba 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
@@ -5,6 +5,7 @@ talkd, telnet, telnetd, tftp, tftpd, and uucpd."
HOMEPAGE = "http://www.gnu.org/software/inetutils"
SECTION = "net"
DEPENDS = "ncurses netbase readline"
+
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7"
@@ -48,6 +49,8 @@ EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \
--enable-rpath=no \
"
+EXTRA_OECONF_append_libc-musl = " --disable-rsh --disable-rcp --disable-rlogin "
+
do_configure_prepend () {
export HELP2MAN='true'
cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath
@@ -66,9 +69,15 @@ do_install_append () {
mv ${D}${libexecdir}/tftpd ${D}${sbindir}/in.tftpd
mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd
mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd
- mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind
- mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd
- mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd
+ if [ -e ${D}${libexecdir}/rlogind ]; then
+ mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind
+ fi
+ if [ -e ${D}${libexecdir}/rshd ]; then
+ mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd
+ fi
+ if [ -e ${D}${libexecdir}/talkd ]; then
+ mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd
+ fi
mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd
mv ${D}${libexecdir}/* ${D}${bindir}/
cp ${WORKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec
@@ -78,7 +87,9 @@ do_install_append () {
cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd
sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/*
-
+ if [ -e ${D}${libdir}/charset.alias ]; then
+ rm -rf ${D}${libdir}/charset.alias
+ fi
rm -rf ${D}${libexecdir}/
# remove usr/lib if empty
rmdir ${D}${libdir} || true