summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-06-07 11:48:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-15 11:15:39 +0100
commit0c5567847edba6b5ab24ae505d16375397cf4b40 (patch)
tree65c8130c34facd0241ad33eabc8158158115e170 /meta
parent37b1a7bada267b89094ce0c3eb81b1de9f04df8e (diff)
downloadopenembedded-core-contrib-0c5567847edba6b5ab24ae505d16375397cf4b40.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.7p1.bb1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
index 7cf34eb618..6b67782695 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"