[oe-commits] Paul Eggleton : classes/core-image: remove SSHSERVER_IMAGE_FEATURES

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 6c78d99cc2e54a99af22357d7567f64e864949b9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6c78d99cc2e54a99af22357d7567f64e864949b9

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Fri Aug 31 17:53:01 2012 +0100

classes/core-image: remove SSHSERVER_IMAGE_FEATURES

This variable was added in the very same commit that added a mechanism
that makes it obsolete: if you have dropbear and you want openssh, you
just add ssh-server-openssh to your IMAGE_FEATURES and it will replace
dropbear via IMAGE_FEATURES_REPLACES_.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/core-image.bbclass                 |    3 +--
 meta/recipes-sato/images/core-image-sato-sdk.bb |    4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 52836d2..f401313 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -64,8 +64,7 @@ IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
 
 X11_IMAGE_FEATURES  = "x11-base apps-x11-core package-management"
 ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management"
-SSHSERVER_IMAGE_FEATURES ??= "ssh-server-dropbear"
-SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ${SSHSERVER_IMAGE_FEATURES}"
+SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear"
 
 inherit image
 
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index 689315b..18ed0cd 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -3,9 +3,7 @@ core-image-sato plus meta-toolchain, development headers and libraries to \
 form a standalone SDK."
 
 IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \
-	tools-debug tools-profile tools-testapps debug-tweaks"
-
-SSHSERVER_IMAGE_FEATURES = "ssh-server-openssh"
+	tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
 
 LICENSE = "MIT"