From 1467cd8872d1977b6a9a4bfb0c2dff9572a1d2df Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Wed, 22 Sep 2021 15:15:31 +0800 Subject: openssh: Don't create openssh-dev populate_sdk installs all -dev packages, so having openssh-dev pulls in openssh-sshd in as a dependency. That then conflicts with Dropbear, which is only using openssh-sftp. The openssh-dev package is empty and unused, created by bitbake.conf Fixes https://github.com/openbmc/openbmc/issues/3819 related to 26dbcdb dropbear: use OpenSSH's sftp-server Signed-off-by: Matt Johnston Change-Id: Ifce8207a5cd46c6d18d0eb82f3c7a9720616dd20 --- meta-phosphor/recipes-connectivity/openssh/openssh_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 meta-phosphor/recipes-connectivity/openssh/openssh_%.bbappend diff --git a/meta-phosphor/recipes-connectivity/openssh/openssh_%.bbappend b/meta-phosphor/recipes-connectivity/openssh/openssh_%.bbappend new file mode 100644 index 000000000..72d59f6a7 --- /dev/null +++ b/meta-phosphor/recipes-connectivity/openssh/openssh_%.bbappend @@ -0,0 +1,4 @@ +# Don't create an empty openssh-dev package. That would pull in openssh-sshd +# even it we are only depending on openssh-sftp, which causes conflicts +# with dropbear +ALLOW_EMPTY:${PN}-dev = "0" -- cgit v1.2.3