From 22bc901f4cdcc0656a34323de3b49148a56e88f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 10 Jan 2019 18:45:26 +0100
Subject: [PATCH] Rework network/ssh package addings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 conf/distro/mortsgna.conf                  |  3 ++-
 qt5-sdk-recipes/qtcreator-sdk-prepare.bb   |  5 ++---
 recipes-image/console/console-net-image.bb | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/conf/distro/mortsgna.conf b/conf/distro/mortsgna.conf
index 2b604f1..80194fb 100644
--- a/conf/distro/mortsgna.conf
+++ b/conf/distro/mortsgna.conf
@@ -175,7 +175,8 @@ DISTRO_EXTRA_RRECOMMENDS += " \
 "
 
 # In case one wants to use packagegroup-basic: Prefer openssh over dropbear
-TASK_BASIC_SSHDAEMON = "openssh-ssh openssh-sshd openssh-scp openssh-sftp openssh-sftp-server"
+# Note: to avoid redundancies TASK_BASIC_SSHDAEMON is used in this layer
+TASK_BASIC_SSHDAEMON = "openssh-ssh openssh-sshd openssh-scp"
 
 # Image features strongly suggested
 EXTRA_IMAGE_FEATURES += " \
diff --git a/qt5-sdk-recipes/qtcreator-sdk-prepare.bb b/qt5-sdk-recipes/qtcreator-sdk-prepare.bb
index 0d7ffc0..2a025c8 100644
--- a/qt5-sdk-recipes/qtcreator-sdk-prepare.bb
+++ b/qt5-sdk-recipes/qtcreator-sdk-prepare.bb
@@ -28,7 +28,6 @@ ALLOW_EMPTY_${PN} = "1"
 RDEPENDS_${PN} = " \
     qtbase \
     gdbserver \
-    openssh-sshd \
-    openssh-ssh \
-    openssh-scp \
+    openssh-sftp openssh-sftp-server \
+    ${TASK_BASIC_SSHDAEMON} \
 "
diff --git a/recipes-image/console/console-net-image.bb b/recipes-image/console/console-net-image.bb
index 5644c97..07e92cd 100644
--- a/recipes-image/console/console-net-image.bb
+++ b/recipes-image/console/console-net-image.bb
@@ -1,14 +1,14 @@
 require console-base-image.bb
 
-NETWORKMAN ?= "networkmanager"
+NETWORKPACKS ?= " \
+    ${TASK_BASIC_SSHDAEMON} \
+    avahi-autoipd \
+    iputils \
+    networkmanager \
+"
 
 IMAGE_INSTALL += " \
-    avahi-autoipd \
-    openssh-sshd \
-    openssh-ssh \
-    openssh-scp \
-    iputils \
-    ${NETWORKMAN} \
+    ${NETWORKPACKS} \
 "
 
 export IMAGE_BASENAME = "console-net-image"