diff options
| author | Changqing Li <changqing.li@windriver.com> | 2019-05-28 12:01:53 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-30 12:37:03 +0100 |
| commit | d365948ebd76625f82ef04e77d35bcfeced42fec (patch) | |
| tree | 90780fade2e7a0952169e3798d3540dd67a93fce | |
| parent | 4edba7ecd3c3f3aaa3ba726f470139824656ce0c (diff) | |
| download | poky-d365948ebd76625f82ef04e77d35bcfeced42fec.tar.gz | |
dropbear: add openssh/openssh-sshd as rconflict
(From OE-Core rev: 0aa21ae925d81cd10d5c44d4d98c9f06df87139d)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 25376038f0..b74d186cd4 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
| @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01" | |||
| 9 | 9 | ||
| 10 | DEPENDS = "zlib virtual/crypt" | 10 | DEPENDS = "zlib virtual/crypt" |
| 11 | RPROVIDES_${PN} = "ssh sshd" | 11 | RPROVIDES_${PN} = "ssh sshd" |
| 12 | RCONFLICTS_${PN} = "openssh-sshd openssh" | ||
| 12 | 13 | ||
| 13 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 14 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
| 14 | 15 | ||