summaryrefslogtreecommitdiffstats
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 17:56:24 +0100
commit897971dc735a06083d628fce63703189155be782 (patch)
tree5d3187d13a983e83a1e485f69df3017c94ea4c40
parent72b5d5bb8e18d9f9b12370d2975967a0499daec9 (diff)
downloadpoky-897971dc735a06083d628fce63703189155be782.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. (From OE-Core rev: 0c5567847edba6b5ab24ae505d16375397cf4b40) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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"
153 153
154RCONFLICTS_${PN} = "dropbear" 154RCONFLICTS_${PN} = "dropbear"
155RCONFLICTS_${PN}-sshd = "dropbear" 155RCONFLICTS_${PN}-sshd = "dropbear"
156RCONFLICTS_${PN}-keygen = "ssh-keygen"
157 156
158CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" 157CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
159CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" 158CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"