From 8d516d8ef61a6769e7391fb27ff43ff622517e68 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 25 Aug 2009 13:39:19 +0200 Subject: openssh: make openssh-keygen conflict with ssh-keygen (old name of it) Should fix situation after e05310f4958ba6c73488d398325670704401ee70 commit. Before: * Package openssh-keygen wants to install file /usr/bin/ssh-keygen But that file is already provided by package * ssh-keygen After: * ERROR: The following packages conflict with openssh-keygen: * ssh-keygen * --- recipes/openssh/openssh.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'recipes/openssh') diff --git a/recipes/openssh/openssh.inc b/recipes/openssh/openssh.inc index 086c9015ad..9e4ca1467e 100644 --- a/recipes/openssh/openssh.inc +++ b/recipes/openssh/openssh.inc @@ -2,6 +2,7 @@ DEPENDS = "zlib openssl" RCONFLICTS_${PN} = "dropbear" RCONFLICTS_${PN}-sshd = "dropbear" +RCONFLICTS_${PN}-keygen = "ssh-keygen" SECTION = "console/network" DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \ @@ -15,7 +16,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" -INC_PR = "r7" +INC_PR = "r8" inherit autotools -- cgit v1.2.3