summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-03-12 22:55:14 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-16 13:43:15 +0000
commitdbf59f0af238d9fced0040c1e7379fa81f0507cd (patch)
tree929d1042fd7b0c4c43db1bd91b21dd84e9136d0a
parent23bfd4e65d6ad79198a189df4ba08794e7dc2614 (diff)
downloadopenembedded-core-dbf59f0af238d9fced0040c1e7379fa81f0507cd.tar.gz
openembedded-core-dbf59f0af238d9fced0040c1e7379fa81f0507cd.tar.bz2
openembedded-core-dbf59f0af238d9fced0040c1e7379fa81f0507cd.zip
poky-image.bbclass: add new IMAGE_FEATURES for ssh servers
Image recipes can now add their ssh server of choice by adding ssh-server-dropbear or ssh-server-openssh to IMAGE_FEATURES. Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-rw-r--r--meta/classes/poky-image.bbclass11
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index 225584bcda..3feeac65e7 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -24,6 +24,8 @@ LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - tools-profile - profiling tools
# - tools-testapps - tools usable to make some device tests
# - nfs-server - NFS server (exports / over NFS to everybody)
+# - ssh-server-dropbear - SSH server (dropbear)
+# - ssh-server-openssh - SSH server (openssh)
# - dev-pkgs - development packages
# - dbg-pkgs - debug packages
#
@@ -79,9 +81,16 @@ POKY_BASE_INSTALL = '\
\
${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \
- \
${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
\
+ ${@base_contains("IMAGE_FEATURES", "ssh-server-dropbear", "task-poky-ssh-dropbear", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dbg-pkgs"], "task-poky-ssh-dropbear-dbg", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dev-pkgs"], "task-poky-ssh-dropbear-dev", "",d)} \
+ \
+ ${@base_contains("IMAGE_FEATURES", "ssh-server-openssh", "task-poky-ssh-openssh", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dbg-pkgs"], "task-poky-ssh-openssh-dbg", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dev-pkgs"], "task-poky-ssh-openssh-dev", "",d)} \
+ \
${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-poky-qt-demos", "",d)} \
${POKY_EXTRA_INSTALL} \