diff options
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 8bf718a64b..d3a416d371 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -26,13 +26,13 @@ ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES", "package-manageme | |||
26 | FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" | 26 | FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" |
27 | FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" | 27 | FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" |
28 | 28 | ||
29 | # packages to install from features, excluding dev/dbg/doc | 29 | # packages to install from features, excluding dev/dbg/doc/ptest |
30 | NORMAL_FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(normal_groups(d), d))}" | 30 | NORMAL_FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(normal_groups(d), d))}" |
31 | NORMAL_FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(normal_groups(d), d))}" | 31 | NORMAL_FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(normal_groups(d), d))}" |
32 | 32 | ||
33 | def normal_groups(d): | 33 | def normal_groups(d): |
34 | """Return all the IMAGE_FEATURES, with the exception of our special package groups""" | 34 | """Return all the IMAGE_FEATURES, with the exception of our special package groups""" |
35 | extras = set(['dev-pkgs', 'staticdev-pkgs', 'doc-pkgs', 'dbg-pkgs']) | 35 | extras = set(['dev-pkgs', 'staticdev-pkgs', 'doc-pkgs', 'dbg-pkgs', 'ptest-pkgs']) |
36 | features = set(oe.data.typed_value('IMAGE_FEATURES', d)) | 36 | features = set(oe.data.typed_value('IMAGE_FEATURES', d)) |
37 | return features.difference(extras) | 37 | return features.difference(extras) |
38 | 38 | ||
@@ -54,6 +54,8 @@ def complementary_globs(featurevar, d): | |||
54 | globs.append('*-doc') | 54 | globs.append('*-doc') |
55 | elif feature == 'dbg-pkgs': | 55 | elif feature == 'dbg-pkgs': |
56 | globs.append('*-dbg') | 56 | globs.append('*-dbg') |
57 | elif feature == 'ptest-pkgs': | ||
58 | globs.append('*-ptest') | ||
57 | return ' '.join(globs) | 59 | return ' '.join(globs) |
58 | 60 | ||
59 | IMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("IMAGE_FEATURES", d)}' | 61 | IMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("IMAGE_FEATURES", d)}' |