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/classes | |
parent | a7c71aba7e62ed419bde6a3aa2b1cb770ae3c615 (diff) | |
download | 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/classes')
-rw-r--r-- | meta/classes/core-image.bbclass | 3 |
1 files changed, 1 insertions, 2 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}" | |||
64 | 64 | ||
65 | X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" | 65 | X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" |
66 | ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management" | 66 | ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management" |
67 | SSHSERVER_IMAGE_FEATURES ??= "ssh-server-dropbear" | 67 | SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear" |
68 | SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ${SSHSERVER_IMAGE_FEATURES}" | ||
69 | 68 | ||
70 | inherit image | 69 | inherit image |
71 | 70 | ||