[OE-core] [PATCH] openssh: resolve install conflict with openssh-sftp-server-dev

[Andreas Oberritter]

On Wed, 19 Sep 2018 08:41:35 +0200
Urs Fässler <urs.fassler at bbv.ch> wrote:

> Image generation fails with the configuration:
>   EXTRA_IMAGE_FEATURES = "ssh-server-dropbear eclipse-debug dev-pkgs"
> This is due the dependency eclipse-debug -> openssh-sftp-server ->
> openssh-dev -> openssh. openssh can not be installed since it conflicts
> with dropbear.

That's odd. Why does openssh-sftp-server depend on openssh-dev? Does openssh-dev contain a file which it shouldn't, e.g. a dynamically loaded module/plug-in?

Regards,
Andreas

> 
> By adding the package openssh-sftp-server-dev we have no dependency to
> openssh-dev nor openssh.
> 
> Signed-off-by: Urs Fässler <urs.fassler at bbv.ch>
> Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
> ---
>  meta/recipes-connectivity/openssh/openssh_7.8p1.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-connectivity/openssh/openssh_7.8p1.bb b/meta/recipes-connectivity/openssh/openssh_7.8p1.bb
> index f4b295f2df..2782cdb2ad 100644
> --- a/meta/recipes-connectivity/openssh/openssh_7.8p1.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_7.8p1.bb
> @@ -132,7 +132,7 @@ do_install_ptest () {
>  
>  ALLOW_EMPTY_${PN} = "1"
>  
> -PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server"
> +PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server ${PN}-sftp-server-dev"
>  FILES_${PN}-scp = "${bindir}/scp.${BPN}"
>  FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
>  FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system"
> @@ -146,6 +146,7 @@ FILES_${PN}-keygen = "${bindir}/ssh-keygen"
>  RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
>  RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
>  RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make"
> +RDEPENDS_${PN}-sftp-server-dev += "${PN}-sftp-server"
>  
>  RPROVIDES_${PN}-ssh = "ssh"
>  RPROVIDES_${PN}-sshd = "sshd"