[oe-commits] [openembedded-core] 40/44: openssh: drop RCONFLICTS for openssh-keygen

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 0c5567847edba6b5ab24ae505d16375397cf4b40
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Thu Jun 7 11:48:36 2018 -0700

    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 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-connectivity/openssh/openssh_7.7p1.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
index 7cf34eb..6b67782 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.