diff options
author | Chris Larson <chris_larson@mentor.com> | 2011-03-07 17:01:13 -0700 |
---|---|---|
committer | Chris Larson <chris_larson@mentor.com> | 2011-05-18 13:59:32 -0700 |
commit | 02860bcea1a132e4409f8fa7e6802f10024508fd (patch) | |
tree | 4670b775615d9a66b84c4685e24b5098e5209fda /meta/classes/image.bbclass | |
parent | b7564c32452e9ce33d9790465b986471ef5a3cba (diff) | |
download | openembedded-core-contrib-02860bcea1a132e4409f8fa7e6802f10024508fd.tar.gz |
Use oe.data for IMAGE_FEATURESkergoth/oe-sync-image-features
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 3c626886b1..6b4e01e7a8 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -12,9 +12,9 @@ INHIBIT_DEFAULT_DEPS = "1" # "export IMAGE_BASENAME" not supported at this time IMAGE_BASENAME[export] = "1" -PACKAGE_INSTALL = "${@' '.join(oe.packagegroup.required_packages('${IMAGE_FEATURES}'.split(), d))}" -PACKAGE_INSTALL_ATTEMPTONLY = "${@' '.join(oe.packagegroup.optional_packages('${IMAGE_FEATURES}'.split(), d))}" -RDEPENDS += "${@' '.join(oe.packagegroup.active_packages('${IMAGE_FEATURES}'.split(), d))}" +PACKAGE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" +PACKAGE_INSTALL_ATTEMPTONLY = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" +RDEPENDS += "${@' '.join(oe.packagegroup.active_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" IMAGE_FEATURES ?= "" @@ -31,9 +31,9 @@ def string_set(iterable): return ' '.join(set(iterable)) def image_features_noextras(d): - for f in d.getVar("IMAGE_FEATURES", True).split(): - if not f in ('dbg', 'dev', 'doc'): - yield f + for feature in oe.data.typed_value('IMAGE_FEATURES', d): + if not feature in ('dbg', 'dev', 'doc'): + yield feature def dbg_packages(d): from itertools import chain |