summaryrefslogtreecommitdiffstats
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:54:32 +0000
commit3f1e50b24e0e0c5243b0d6a9b3fe9e075add353e (patch)
tree68a8c6f6d392ec6d7b5a7a2c6c7a0bcf78a2455c
parent6b088d6d62a366ff9c7c91f7ca9e746aebf54170 (diff)
downloadpoky-3f1e50b24e0e0c5243b0d6a9b3fe9e075add353e.tar.gz
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. (From OE-Core rev: dbf59f0af238d9fced0040c1e7379fa81f0507cd) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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
24# - tools-profile - profiling tools 24# - tools-profile - profiling tools
25# - tools-testapps - tools usable to make some device tests 25# - tools-testapps - tools usable to make some device tests
26# - nfs-server - NFS server (exports / over NFS to everybody) 26# - nfs-server - NFS server (exports / over NFS to everybody)
27# - ssh-server-dropbear - SSH server (dropbear)
28# - ssh-server-openssh - SSH server (openssh)
27# - dev-pkgs - development packages 29# - dev-pkgs - development packages
28# - dbg-pkgs - debug packages 30# - dbg-pkgs - debug packages
29# 31#
@@ -79,9 +81,16 @@ POKY_BASE_INSTALL = '\
79 \ 81 \
80 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \ 82 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
81 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \ 83 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \
82 \
83 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \ 84 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
84 \ 85 \
86 ${@base_contains("IMAGE_FEATURES", "ssh-server-dropbear", "task-poky-ssh-dropbear", "",d)} \
87 ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dbg-pkgs"], "task-poky-ssh-dropbear-dbg", "",d)} \
88 ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dev-pkgs"], "task-poky-ssh-dropbear-dev", "",d)} \
89 \
90 ${@base_contains("IMAGE_FEATURES", "ssh-server-openssh", "task-poky-ssh-openssh", "",d)} \
91 ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dbg-pkgs"], "task-poky-ssh-openssh-dbg", "",d)} \
92 ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dev-pkgs"], "task-poky-ssh-openssh-dev", "",d)} \
93 \
85 ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \ 94 ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
86 ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-poky-qt-demos", "",d)} \ 95 ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-poky-qt-demos", "",d)} \
87 ${POKY_EXTRA_INSTALL} \ 96 ${POKY_EXTRA_INSTALL} \