diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-08-31 17:53:01 +0100 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-09-03 22:52:49 -0700 |
| commit | 6c78d99cc2e54a99af22357d7567f64e864949b9 (patch) | |
| tree | b590503ae6f4b21a71c8825986bc9f438abecee1 /meta | |
| parent | dc7e857f2cf16aad859b6a245c29b3958cd065ea (diff) | |
| download | openembedded-core-6c78d99cc2e54a99af22357d7567f64e864949b9.tar.gz openembedded-core-6c78d99cc2e54a99af22357d7567f64e864949b9.tar.bz2 openembedded-core-6c78d99cc2e54a99af22357d7567f64e864949b9.zip | |
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@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/core-image.bbclass | 3 | ||||
| -rw-r--r-- | 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 52836d22e1..f4013134d5 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 689315b241..18ed0cd192 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" |