From: Andre McCurdy <armccurdy@gmail.com>
Date: Thu, 7 Jun 2018 18:48:36 +0000 (-0700)
Subject: openssh: drop RCONFLICTS for openssh-keygen
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~17674
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c5567847edba6b5ab24ae505d16375397cf4b40;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

openssh: drop RCONFLICTS for openssh-keygen

The "ssh-keygen" package no longer seems to be provided by any recipe
in oe-core or meta-oe, so there's no clear reason for the
openssh-keygen package to conflict with it.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
index 7cf34eb618b..6b677826955 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
@@ -153,7 +153,6 @@ RPROVIDES_${PN}-sshd = "sshd"
 
 RCONFLICTS_${PN} = "dropbear"
 RCONFLICTS_${PN}-sshd = "dropbear"
-RCONFLICTS_${PN}-keygen = "ssh-keygen"
 
 CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
 CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"