summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@codeconstruct.com.au>2021-09-22 10:15:31 +0300
committerPatrick Williams <patrick@stwcx.xyz>2021-09-22 14:40:21 +0300
commit1467cd8872d1977b6a9a4bfb0c2dff9572a1d2df (patch)
treed22f9f98ca5f5b205e7be211641e8e41da761323
parent8b594f3b0b6ceb3855dc693a95fae6a5e627eae0 (diff)
downloadopenbmc-1467cd8872d1977b6a9a4bfb0c2dff9572a1d2df.tar.xz
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 <matt@codeconstruct.com.au> Change-Id: Ifce8207a5cd46c6d18d0eb82f3c7a9720616dd20
-rw-r--r--meta-phosphor/recipes-connectivity/openssh/openssh_%.bbappend4
1 files changed, 4 insertions, 0 deletions
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"