Commit Graph

34 Commits

Author SHA1 Message Date
Paul Gortmaker
762d1eb305 inetutils: use update-alternatives for more manpages
To fix:

   file /usr/share/man/man1/dnsdomainname.1 conflicts between attempted installs
   of inetutils-doc-1.9.4-r0.core2_64 and net-tools-doc-1.60+26-r0.core2_64

   file /usr/share/man/man8/syslogd.8 conflicts between attempted installs
   of inetutils-doc-1.9.4-r0.core2_64 and sysklogd-doc-1.5.1-r0.core2_64

   file /usr/share/man/man1/logger.1 conflicts between attempted installs
   of util-linux-doc-2.29.1-r0.core2_64 and inetutils-doc-1.9.4-r0.core2_64

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2017-03-24 14:10:18 -04:00
Paul Gortmaker
c6a894f808 inetutils: bump priority to avoid conflict issue
To fix:

 [log_check] Warn: update-alternatives: logger.1 has multiple providers
 with the same priority, please check
 tmp/work/genericx86_64-overc-linux/cube-graphical-builder/0.2-r0/rootfs/usr/lib/opkg/alternatives/logger.1
 for details

In that file we see:
 /usr/share/man/man1/logger.1
 /usr/share/man/man1/logger.1.util-linux 80
 /usr/share/man/man1/logger.1.inetutils 80

Since most people would probably expect the util-linux version, we
drop inetutils by one.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2017-03-24 14:10:18 -04:00
Amarnath Valluri
9fb708d875 inetutils: Move files only when src != dst.
While moving files from ${bindir} to ${base_bindir} check if both are same.

Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2017-03-23 08:26:59 -04:00
Peter Kjellerstedt
0c31f55bcf Make use of the new bb.utils.filter() function
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-07 13:30:26 +01:00
Kai Kang
9c6cc7ae78 inetutils: update files for -dbg packages
All .debug directories are packaged in inetutils-rshd-dbg which caused
by AUTOPACKAGEDEBUG. Disable it and split .debug directories and files
to right -dbg package.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2017-02-22 08:31:59 -05:00
Paul Gortmaker
2418ea389b inetutils: register hostname.1 man page as an alternate
The coreutils has a hostname command; this package already dealt
with that existing as an alternate, but for some reason it did not
do the same with the manpage of the same name.  The conflict varied
from intermittent to "why does this keep happening to me?!?".

Mark gets credit for the fix; he didn't want to bear witness to yet
another premature death of a USB keyboard and suggested the change
here; which I then largely just confirmed as functional, since I
happened to "be so lucky" as to have the reproducer.

The failure showed up in do_rootfs as follows:

ERROR: cube-graphical-builder-0.2-r0 do_rootfs: [log_check] cube-graphical-builder:
found 1 error message in the logfile: [log_check] update-alternatives:
Error: not linking tmp/work/qemuarm64-overc-linux/cube-graphical-builder/0.2-r0/rootfs/usr/share/man/man1/hostname.1
to /usr/share/man/man1/hostname.1.coreutils since
tmp/work/qemuarm64-overc-linux/cube-graphical-builder/0.2-r0/rootfs/usr/share/man/man1/hostname.1
exists and is not a link

Cc: Mark Hatle <mark.hatle@windriver.com>
Cc: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2017-02-22 08:31:59 -05:00
Khem Raj
3773725982 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>
2016-12-15 09:21:29 -05:00
Chen Qi
c5c78e0511 inetutils: fix alternative priority to avoid conflict
Fix ALTERNATIVE_PRIORITY for the logger utility to avoid the same priority
with that from util-linux.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-12-14 09:20:12 -05:00
Robert Yang
80c5535dbe inetutils: do_configure: fix "Argument list too long"
Fixed when len(TMPDIR) =  410:
aclocal: error: cannot open echo [snip]: Argument list too long

This is becuase it has a lot of m4 files, use relative path for them
can fix the problem.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-12-14 09:20:11 -05:00
Jackie Huang
615872a8af inetutils: fixes for ipv6 feature
* Rebase the patch fix-disable-ipv6.patch
* Add PACKAGECONFIG for ipv6 and ping6 instead of
  using noipv6 in EXTRA_OECONF
* Fix the do_install to avoid failure when ipv6
  is disable

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-09-05 13:34:12 -04:00
Ross Burton
275b6c30fb meta-networking: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-05-05 11:41:28 -04:00
Richard Purdie
e5ac52b4ad inetutils: Fix build when static libs disabled
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-02-29 16:23:34 -05:00
Qi.Chen@windriver.com
395519075d inetutils: fix rcp to work with large file
This issue occurs When we copy file by rcp command between target and host,
if the file > 2GB, it will fail.
The cause is that it used incorrect data type on file size in sink() of rcp.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2015-10-21 12:13:03 -04:00
Kai Kang
43188cd974 inetutils: add package config pam
Add package config pam for inetutils. And only check pam_appl.h when pam
is enabled.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2015-09-14 10:40:35 -04:00
Kai Kang
55713b8c15 inetutils: 1.9.2 -> 1.9.4
Upgrade inetutils from 1.9.2 to 1.9.4.

* add homepage
* update inetutils/version.patch

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>

Conflicts:
	meta-networking/recipes-connectivity/inetutils/inetutils/telnetd-Fix-deadlock-on-cleanup.patch
2015-08-19 20:43:30 -04:00
Roy Li
c12b9596af inetutils: fix tcpd path in xinetd configuration file
tcpd from tcp-wrapper is installed into /usr/sbin/, not /usr/bin/
using sed to dynamical update the path to add the robust

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2015-07-16 13:27:02 -04:00
Li Wang
279b7cd97d inetutils: move daemon servers from bin to sbin directory
move daemon servers from bin to sbin directory:
tftpd, telnetd, rshd, rexecd and rlogind

Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2015-07-15 15:23:27 -04:00
Joe MacDonald
8980f0d2a2 meta-networking: standardize SECTION values
SECTION has been used inconsistently throughout the recipes in this layer.
Convert them to all use the same convention.

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2015-06-05 20:42:25 -04:00
Roy.Li
e3f2ac1d1b inetutils: inherit texinfo
inherit texinfo to use native command instead of host command

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-10-30 09:00:09 +01:00
Roy Li
a39f60d812 inetutils: uprev to 1.9.2
1. remove unneeded patches:
 inetutils-1.9.1/disable-pre-ANSI-compilers.patch
 inetutils-1.9.1/remove-gets.patch
2. Update the version from 1.9.1 to 1.9.2 in version.patch
3. remove PR

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2014-09-08 16:57:27 -04:00
Ting Liu
61362da811 inetutils: not use auto-detected login for telnetd
Below error appears as login was auto-detected by default:
| telnetd: /usr/bin/login -p -h 192.168.2.1 : No such file or directory.
| Connection closed by foreign host.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-08-13 23:28:06 +02:00
Jackie Huang
bc969d3705 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 <jackie.huang@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
2014-04-02 11:18:54 -04:00
Roy Li
038a6f71e1 inetutils: disable rpath
The rpath, which configuration computers, is a host-related path in
cross-compile environment; In fact, need to not add rpath into elf
file.

   WARNING: QA Issue: package inetutils-ftp contains bad RPATH
   /buildarea/build/new/bitbake_build/tmp/sysroots/qemux86-64/usr/lib64 in file
   /buildarea/build/new/bitbake_build/tmp/work/x86_64-wrs-linux/inetutils/1.9.1-r1/packages-split/inetutils-ftp/usr/bin/ftp.inetutils

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Joe MacDonald <joe@deserted.net>
2014-02-12 20:09:25 -05:00
Ting Liu
c7c3e97d6a inetutils: fix libreadline path to fix QA errors
If wrong path set, inetutils configure script will add a absolute
rpath, which result in the below QA errors:
| ERROR: QA Issue: package inetutils-ftp contains bad RPATH
| ERROR: QA Issue: package inetutils-telnet contains bad RPATH
| ERROR: QA Issue: package inetutils-telnetd contains bad RPATH
| ERROR: QA run found fatal errors. Please consider fixing them.
| ERROR: Function failed: do_package_qa

Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-22 12:22:38 +01:00
Eric BENARD
3402bfac6b inetutils: fix compile error when PATH_PROCNET_DEV is undefined
Signed-off-by: Eric Bénard <eric@eukrea.com>
2014-01-08 22:26:26 +00:00
Joe MacDonald
97f3a9604f inetutils: correct QA issue (unrecognized configure option)
WARNING: QA Issue: inetutils: configure was passed unrecognised options: --with-path-login --with-path-procnet-dev

Neither of these appear to be valid for inetutils-1.9.1, so remove them.

Signed-off-by: Joe MacDonald <joe@deserted.net>
2013-12-04 16:19:03 -05:00
Jackie Huang
0abd142f0a inetutils: add --with-libreadline-prefix to avoid host contamination
Fix the do_rootfs error:
| Computing transaction...error: Can't install inetutils-telnetd-1.9.1-r1.1@i686: no package provides libreadline.so.5

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
2013-12-04 10:48:30 -05:00
Jackie Huang
1f88425be7 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@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
2013-12-04 10:48:08 -05:00
Khem Raj
87e5240294 inetutils: Remove empty usr/lib
This directory is empty and is flagged by QA checker

ERROR: QA Issue: inetutils: Files/directories were installed but not
shipped
  /usr/lib

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
2013-09-06 09:36:33 -04:00
Martin Jansa
43d5c3ec0b inetutils: add PACKAGECONFIG for ftp and uucpd
* readline support is autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-30 11:17:09 +02:00
Roy.Li
e81ef5153c inetutils: several improvement
1. integrate rexec, rlogin, rsh, telnet, tftpd xinetd startup scripts
2. inherit update-alternatives bbclass, not call update-alternatives directly.
3. package all commands into subpackages

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
2013-07-17 15:44:38 -04:00
Martin Jansa
a45830a39b recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
  tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
  tabs is the need to update a lot of recipes). Lately this advice
  was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
  error prone when someone is not sure if e.g.
  do_generate_toolchain_file() is Python or shell task and also allows
  to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
  potentially bad (shouldn't be used for indenting of multiline
  variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
  we're quite inconsistent wheater it's first character on line
  under opening quote or under first non-whitespace character in
  previous line.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
2013-04-15 16:23:17 +02:00
Jackie Huang
70b1e90f6d inetutils: fix PN -> BPN in do_install for multilibs
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
2013-03-18 15:13:52 -04:00
chunrong guo
11a6ce97f7 inetutils : Update to 1.9.1
* There are difference spaces between  inetutils-1.8/COPYING
     and inetutils-1.9.1/COPYING,so md5sum is changed.

   * the following patches are accepted by inetutils 1.9.1 upstream
     inetutils-1.8-1005-ftpd-add-daemon-D-nommu-support.patch
     inetutils-1.8-1004-detect-fork-support.patch
     inetutils-1.8-1003-use-daemon-from-the-C-library-when-possible.patch
     inetutils-1.8-1002-rshd-detect-__rcmd_errstr-support-in-the-C-lib.patch
     inetutils-1.8-1001-ftp-rename-ruserpass-to-avoid-C-library-collision.patch
     inetutils-1.8-0002-argp-fix-program_invocation_name-detection.patch

Signed-off-by: Chunrong Guo <b40290@freescale.com>
2012-11-27 14:43:58 -05:00