Rework network/ssh package addings
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -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 += " \
|
||||
|
||||
@@ -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} \
|
||||
"
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user