From d67b974505d02221e6b2d4ebbe7fc3f98af54cbf Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Sun, 21 Aug 2022 23:34:12 +0200
Subject: [PATCH] oniro-linux: Add sftp-server package
Modern ssh clients use SFTP protocol and refuse to connect using
SCP protocol (dropbear uses) by default. Adding sftp-server to allow
sftp connections in Oniro.
This requires workaround for [Yocto #14858] to be applied for every
Oniro images, not only extra-tests.
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
meta-oniro-core/conf/distro/oniro-linux.conf | 3 +++
meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb | 2 --
.../recipes-core/packagegroups/packagegroup-connectivity.bb | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 1667d080..0ce27d0b 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -122,3 +122,6 @@ ROOTFS_RO_UNNEEDED:remove = "shadow"
# Set default hostname to reflect the DISTRO
hostname:pn-base-files = "${DISTRO}-${MACHINE}"
+
+# Workaround for https://bugzilla.yoctoproject.org/show_bug.cgi?id=14858
+PACKAGE_EXCLUDE_COMPLEMENTARY:append = " openssh"
diff --git a/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb b/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb
index 3d8d30e7..480956cb 100644
--- a/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb
+++ b/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb
@@ -18,5 +18,3 @@ EXTRA_IMAGE_FEATURES:append = " ptest-pkgs debug-tweaks"
# filesystem.
IMAGE_FSTYPES:append = " ext4"
-# Workaround for https://bugzilla.yoctoproject.org/show_bug.cgi?id=14858
-PACKAGE_EXCLUDE_COMPLEMENTARY:append = " openssh "
diff --git a/meta-oniro-core/recipes-core/packagegroups/packagegroup-connectivity.bb b/meta-oniro-core/recipes-core/packagegroups/packagegroup-connectivity.bb
index 70b5db7f..1e84b6d4 100644
--- a/meta-oniro-core/recipes-core/packagegroups/packagegroup-connectivity.bb
+++ b/meta-oniro-core/recipes-core/packagegroups/packagegroup-connectivity.bb
@@ -14,6 +14,7 @@ PACKAGES = "\
RDEPENDS:packagegroup-net-essentials = "\
dropbear \
+ openssh-sftp-server \
${@bb.utils.contains("COMBINED_FEATURES", "wifi", "packagegroup-base-wifi iw", "", d)} \
networkmanager \
networkmanager-nmcli \
--
GitLab