From 3da22ee40420fbea6c75ff07225470353fb0a5e8 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Mon, 4 Dec 2017 14:52:25 -0500 Subject: 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 Signed-off-by: Armin Kuster Signed-off-by: Joe MacDonald --- meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta-networking') 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}" -- cgit 1.2.3-korg