From 48ea7812c783cc759784686a8c5b95fe123e9973 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Fri, 1 Jul 2022 07:04:33 -1000 Subject: 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 (cherry picked from commit 4667abcc925ae0c430cccb480ec530506f6201ae) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-core/dropbear/dropbear.inc | 5 +++++ 1 file changed, 5 insertions(+) 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" RPROVIDES_${PN} = "ssh sshd" RCONFLICTS_${PN} = "openssh-sshd openssh" +# break dependency on base package for -dev package +# otherwise SDK fails to build as the main openssh and dropbear packages +# conflict with each other +RDEPENDS:${PN}-dev = "" + DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ -- cgit v1.2.3-54-g00ecf