From 0997becc3b62237cd23ce758139055c5700e34a1 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Fri, 10 Mar 2023 09:40:45 +0100 Subject: [PATCH] refactor(coreos-image.bbclass): use openssh instead of dropbear BREAKING CHANGE: using the ssh-server IMAGE_FEATURES now install openssh instead of dropbear --- documentation/ref-manual/features.rst | 2 +- layers/meta-belden-coreos/classes/coreos-image.bbclass | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/ref-manual/features.rst b/documentation/ref-manual/features.rst index 810821b..f9d4811 100644 --- a/documentation/ref-manual/features.rst +++ b/documentation/ref-manual/features.rst @@ -36,7 +36,7 @@ these features is as follows: - *hwcodecs:* Installs hardware acceleration codecs. - *tools-debug:* Installs debugging tools such as ``strace`` and ``gdb``. - *tools-profile:* Installs profiling tools such as ``valgrind`` and ``perf``. -- *ssh-server:* Installs the Dropbear minimal SSH server. +- *ssh-server:* Installs the OpenSSH SSH server. - *podman:*: Installs the Podman container runtime - *networkmanager:* Installs the NetworkManager daemon and command line client - *cockpit:* Installs the cockpit web interface diff --git a/layers/meta-belden-coreos/classes/coreos-image.bbclass b/layers/meta-belden-coreos/classes/coreos-image.bbclass index d2898c4..214847e 100644 --- a/layers/meta-belden-coreos/classes/coreos-image.bbclass +++ b/layers/meta-belden-coreos/classes/coreos-image.bbclass @@ -46,8 +46,8 @@ MACHINE_HWCODECS ??= "" # # ssh-server: provide a ssh server, on core-image, two ssh server are supported # and the features ssh-server-dropbear and ssh-server-openssh are -# available. For CoreOS, we only support dropbear -FEATURE_PACKAGES_ssh-server = "packagegroup-core-ssh-dropbear" +# available. For CoreOS, we only support openssh +FEATURE_PACKAGES_ssh-server = "packagegroup-core-ssh-openssh" # The ptest distro feature want to install openssh-ptest by default, that conflict with dropbear # Do not install openssh complementary packages if either packagegroup-core-ssh-dropbear or dropbear