summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2022-07-01 07:04:33 -1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-15 12:29:17 +0100
commit48ea7812c783cc759784686a8c5b95fe123e9973 (patch)
treec21f52e63f38257917c15a4a5ce609d415efcf5e /meta
parent010094a2ae3c32843233f7702e4efcd8d6f1941c (diff)
downloadpoky-48ea7812c783cc759784686a8c5b95fe123e9973.tar.gz
dropbear: break dependency on base package for -dev package
Otherwise the SDK fails to build as the main openssh and dropbear packages conflict with each other (From OE-Core rev: 7bc7d4d24ee05a3bbb9a82ff1089da5d162c8497) Signed-off-by: Steve Sakoman <steve@sakoman.com> (cherry picked from commit 4667abcc925ae0c430cccb480ec530506f6201ae) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index b949a9a337..026292230c 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -12,6 +12,11 @@ DEPENDS = "zlib virtual/crypt"
12RPROVIDES_${PN} = "ssh sshd" 12RPROVIDES_${PN} = "ssh sshd"
13RCONFLICTS_${PN} = "openssh-sshd openssh" 13RCONFLICTS_${PN} = "openssh-sshd openssh"
14 14
15# break dependency on base package for -dev package
16# otherwise SDK fails to build as the main openssh and dropbear packages
17# conflict with each other
18RDEPENDS:${PN}-dev = ""
19
15DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 20DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
16 21
17SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ 22SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \