diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-08-31 17:53:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 12:52:54 +0100 |
commit | 5f0e3d8c89b70c424c956c19e61187486fc9b980 (patch) | |
tree | 4345c6d6c4197c26dd0bb8b33fd2b9beeb685088 /meta | |
parent | a7c71aba7e62ed419bde6a3aa2b1cb770ae3c615 (diff) | |
download | ast2050-yocto-poky-5f0e3d8c89b70c424c956c19e61187486fc9b980.zip ast2050-yocto-poky-5f0e3d8c89b70c424c956c19e61187486fc9b980.tar.gz |
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_.
(From OE-Core rev: 6c78d99cc2e54a99af22357d7567f64e864949b9)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 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" |