diff options
author | Steve Sakoman <steve@sakoman.com> | 2022-07-01 07:01:17 -1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-15 12:29:17 +0100 |
commit | 010094a2ae3c32843233f7702e4efcd8d6f1941c (patch) | |
tree | 9f4a81cefc1aa4831648965825d796fc5f3a6966 /meta/recipes-connectivity/openssh | |
parent | 43980058ca013b5dff20cd6a04d39b76a9864e64 (diff) | |
download | poky-010094a2ae3c32843233f7702e4efcd8d6f1941c.tar.gz |
openssh: 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: e863fc060940d11cd6fd58f0f314333ed419cf54)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit f90647e9dd95cfd29b5bdb8d7dcd688a10fc060c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_8.2p1.bb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_8.2p1.bb b/meta/recipes-connectivity/openssh/openssh_8.2p1.bb index eaec26cac0..c529d1d060 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.2p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.2p1.bb | |||
@@ -196,6 +196,11 @@ RRECOMMENDS_${PN}-sshd_append_class-target = "\ | |||
196 | ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \ | 196 | ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \ |
197 | " | 197 | " |
198 | 198 | ||
199 | # break dependency on base package for -dev package | ||
200 | # otherwise SDK fails to build as the main openssh and dropbear packages | ||
201 | # conflict with each other | ||
202 | RDEPENDS:${PN}-dev = "" | ||
203 | |||
199 | # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies | 204 | # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies |
200 | RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" | 205 | RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" |
201 | 206 | ||