diff options
| author | Lianhao Lu <lianhao.lu@intel.com> | 2012-07-03 12:43:32 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-03 14:52:15 +0100 |
| commit | e36d12a9c1cf69540079e48a1dfadbc343758e48 (patch) | |
| tree | 8506df8a2939fe54ff44b881f60bcf5d9c1ab225 /meta/classes | |
| parent | 169a89b10817b742c063fcd76721e4dbbcca6199 (diff) | |
| download | openembedded-core-e36d12a9c1cf69540079e48a1dfadbc343758e48.tar.gz openembedded-core-e36d12a9c1cf69540079e48a1dfadbc343758e48.tar.bz2 openembedded-core-e36d12a9c1cf69540079e48a1dfadbc343758e48.zip | |
image/core-image: Handle conflicting IMAGE_FEATURES.
IMAGE_FEATURES such as 'ssh-server-dropbear' and 'ssh-server-openssh'
can't be both enabled. User can use the following variables to define
the relationship of image features:
IMAGE_FEATURES_REPLACES_foo = "bar" means including image feature "foo"
would replace the image feature "bar".
IMAGE_FEATURES_CONFLICTS_foo = "bar" means including both image features
"foo" and "bar" would cause an parsing error.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/core-image.bbclass | 11 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 17 |
2 files changed, 27 insertions, 1 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 25f5c5a8dc..6b207d7cfa 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -47,6 +47,14 @@ PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh" PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos" + +# IMAGE_FEAETURES_REPLACES_foo = 'bar1 bar2' +# Including image feature foo would replace the image features bar1 and bar2 +IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" + +# IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' +# An error exception would be raised if both image features foo and bar1(or bar2) are included + CORE_IMAGE_BASE_INSTALL = '\ task-core-boot \ task-base-extended \ @@ -60,7 +68,8 @@ 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 apps-x11-pimlico package-management" -SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear" +SSHSERVER_IMAGE_FEATURES ??= "ssh-server-dropbear" +SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ${SSHSERVER_IMAGE_FEATURES}" inherit image diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 24fd868087..f1b829fe18 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -94,6 +94,23 @@ python () { deps += " %s:do_populate_sysroot" % dep d.appendVarFlag('do_build', 'depends', deps) + #process IMAGE_FEATURES, we must do this before runtime_mapping_rename + #Check for replaces image features + features = set(oe.data.typed_value('IMAGE_FEATURES', d)) + remain_features = features.copy() + for feature in features: + replaces = set((d.getVar("IMAGE_FEATURES_REPLACES_%s" % feature, True) or "").split()) + remain_features -= replaces + + #Check for conflict image features + for feature in remain_features: + conflicts = set((d.getVar("IMAGE_FEATURES_CONFLICTS_%s" % feature, True) or "").split()) + temp = conflicts & remain_features + if temp: + bb.fatal("%s contains conflicting IMAGE_FEATURES %s %s" % (d.getVar('PN', True), feature, ' '.join(list(temp)))) + + d.setVar('IMAGE_FEATURES', ' '.join(list(remain_features))) + # If we don't do this we try and run the mapping hooks while parsing which is slow # bitbake should really provide something to let us know this... if d.getVar('BB_WORKERCONTEXT', True) is not None: |