From 897971dc735a06083d628fce63703189155be782 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Thu, 7 Jun 2018 11:48:36 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssh/openssh_7.7p1.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'meta/recipes-connectivity/openssh') 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" -- cgit v1.2.3-54-g00ecf