]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
openssh: break dependency on base package for -dev package
authorSteve Sakoman <steve@sakoman.com>
Fri, 1 Jul 2022 17:01:17 +0000 (07:01 -1000)
committerSteve Sakoman <steve@sakoman.com>
Thu, 7 Jul 2022 16:42:41 +0000 (06:42 -1000)
Otherwise the SDK fails to build as the main openssh and dropbear packages
conflict with each other

Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit f90647e9dd95cfd29b5bdb8d7dcd688a10fc060c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/recipes-connectivity/openssh/openssh_8.2p1.bb

index eaec26cac0452dd268d51cf270e71e730e0d8b72..c529d1d060be8663d4e52c01a756785772ad190b 100644 (file)
@@ -196,6 +196,11 @@ RRECOMMENDS_${PN}-sshd_append_class-target = "\
     ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \
 "
 
+# 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 = ""
+
 # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies
 RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils"