diff options
| author | Steve Sakoman <steve@sakoman.com> | 2022-07-01 07:01:17 -1000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-08 08:27:16 +0100 |
| commit | 523a19e0b025e6e6e5d56866c4f5554c87e2a870 (patch) | |
| tree | 29c61f3702d399e40e0addeee3c52d4de5276038 /meta/recipes-connectivity | |
| parent | af092f2d12678afb1b7e65bea6e0424f606d62c5 (diff) | |
| download | poky-523a19e0b025e6e6e5d56866c4f5554c87e2a870.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: f90647e9dd95cfd29b5bdb8d7dcd688a10fc060c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_8.9p1.bb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb index f306b1245a..a3a0016ce5 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb | |||
| @@ -166,6 +166,11 @@ RRECOMMENDS:${PN}-sshd:append:class-target = "\ | |||
| 166 | ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \ | 166 | ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \ |
| 167 | " | 167 | " |
| 168 | 168 | ||
| 169 | # break dependency on base package for -dev package | ||
| 170 | # otherwise SDK fails to build as the main openssh and dropbear packages | ||
| 171 | # conflict with each other | ||
| 172 | RDEPENDS:${PN}-dev = "" | ||
| 173 | |||
| 169 | # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies | 174 | # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies |
| 170 | RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" | 175 | RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" |
| 171 | 176 | ||
