diff options
| author |   Mark Asselstine <mark.asselstine@windriver.com> | 2017-12-04 14:52:25 -0500 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2018-01-08 12:04:02 -0500 |
| commit | 3da22ee40420fbea6c75ff07225470353fb0a5e8 (patch) | |
| tree | d3d06cd07976ed58854e11976f6c73032887c61a /meta-networking | |
| parent | 2ad7176c4a89caf4f83cfd6e2246b897acdafabb (diff) | |
| download | meta-openembedded-3da22ee40420fbea6c75ff07225470353fb0a5e8.tar.gz | |
inetutils: make -syslog rconflict with other system loggers
With oe-core commit cdcebd81c872cb7386c658998e27cf24e1d0447c
[initscripts: don't use update-alternatives] we start seeing a a
rootfs generation failure when both sysklogd and inetutils are present
in the image:
ERROR: do_rootfs: [log_check] : found 1 error message in the logfile:
[log_check] update-alternatives: Error: not linking
.../0.2-r0/rootfs/usr/share/man/man8/syslogd.8 to
/usr/share/man/man8/syslogd.8.inetutils since
.../0.2-r0/rootfs/usr/share/man/man8/syslogd.8 exists and is not a link
As has been done with the other packages which provide system logging
we add an rconflicts to only allow one to exist in a rootfs image at a
time.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb | 3 |
1 files changed, 3 insertions, 0 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 4655bc5777..190cd5f142 100644 --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb @@ -169,7 +169,10 @@ FILES_${PN}-hostname = "${base_bindir}/hostname.${BPN}" FILES_${PN}-ifconfig = "${base_sbindir}/ifconfig.${BPN}" FILES_${PN}-traceroute = "${bindir}/traceroute.${BPN}" FILES_${PN}-logger = "${bindir}/logger.${BPN}" + FILES_${PN}-syslogd = "${base_sbindir}/syslogd.${BPN}" +RCONFLICTS_${PN}-syslogd = "rsyslog busybox-syslog sysklogd syslog-ng" + FILES_${PN}-ftp = "${bindir}/ftp.${BPN}" FILES_${PN}-tftp = "${bindir}/tftp.${BPN}" |