diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-08-25 13:39:19 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-08-25 13:41:43 +0200 |
| commit | 8d516d8ef61a6769e7391fb27ff43ff622517e68 (patch) | |
| tree | e25798418b63873ebeb9860eedb9ff379949934a /recipes/openssh/openssh.inc | |
| parent | acdd06bbf06ab549d3e9b35958cb4177c1b88836 (diff) | |
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 *
Diffstat (limited to 'recipes/openssh/openssh.inc')
| -rw-r--r-- | recipes/openssh/openssh.inc | 3 |
1 files changed, 2 insertions, 1 deletions
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 |