diff options
-rw-r--r-- | meta/classes/image.bbclass | 5 | ||||
-rw-r--r-- | meta/conf/documentation.conf | 1 | ||||
-rw-r--r-- | meta/lib/oe/packagegroup.py | 8 |
3 files changed, 2 insertions, 12 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 07aa1f1fa5..694b58fc9f 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -62,10 +62,7 @@ def check_image_features(d): | |||
62 | valid_features = (d.getVarFlag('IMAGE_FEATURES', 'validitems') or "").split() | 62 | valid_features = (d.getVarFlag('IMAGE_FEATURES', 'validitems') or "").split() |
63 | valid_features += d.getVarFlags('COMPLEMENTARY_GLOB').keys() | 63 | valid_features += d.getVarFlags('COMPLEMENTARY_GLOB').keys() |
64 | for var in d: | 64 | for var in d: |
65 | if var.startswith("PACKAGE_GROUP_"): | 65 | if var.startswith("FEATURE_PACKAGES_"): |
66 | bb.warn("PACKAGE_GROUP is deprecated, please use FEATURE_PACKAGES instead") | ||
67 | valid_features.append(var[14:]) | ||
68 | elif var.startswith("FEATURE_PACKAGES_"): | ||
69 | valid_features.append(var[17:]) | 66 | valid_features.append(var[17:]) |
70 | valid_features.sort() | 67 | valid_features.sort() |
71 | 68 | ||
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 44d69197bf..c6544b9698 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf | |||
@@ -306,7 +306,6 @@ PACKAGE_BEFORE_PN[doc] = "Enables easily adding packages to PACKAGES before ${PN | |||
306 | PACKAGE_CLASSES[doc] = "This variable specifies the package manager to use when packaging data. It is set in the conf/local.conf file in the Build Directory." | 306 | PACKAGE_CLASSES[doc] = "This variable specifies the package manager to use when packaging data. It is set in the conf/local.conf file in the Build Directory." |
307 | PACKAGE_EXCLUDE[doc] = "Packages to exclude from the installation. If a listed package is required, an error is generated." | 307 | PACKAGE_EXCLUDE[doc] = "Packages to exclude from the installation. If a listed package is required, an error is generated." |
308 | PACKAGE_EXTRA_ARCHS[doc] = "Specifies the list of architectures compatible with the device CPU. This variable is useful when you build for several different devices that use miscellaneous processors." | 308 | PACKAGE_EXTRA_ARCHS[doc] = "Specifies the list of architectures compatible with the device CPU. This variable is useful when you build for several different devices that use miscellaneous processors." |
309 | PACKAGE_GROUP[doc] = "Defines one or more packages to include in an image when a specific item is included in IMAGE_FEATURES." | ||
310 | PACKAGE_INSTALL[doc] = "List of the packages to be installed into the image. The variable is generally not user-defined and uses IMAGE_INSTALL as part of the list." | 309 | PACKAGE_INSTALL[doc] = "List of the packages to be installed into the image. The variable is generally not user-defined and uses IMAGE_INSTALL as part of the list." |
311 | PACKAGE_INSTALL_ATTEMPTONLY[doc] = "List of packages attempted to be installed. If a listed package fails to install, the build system does not generate an error. This variable is generally not user-defined." | 310 | PACKAGE_INSTALL_ATTEMPTONLY[doc] = "List of packages attempted to be installed. If a listed package fails to install, the build system does not generate an error. This variable is generally not user-defined." |
312 | PACKAGECONFIG[doc] = "This variable provides a means of enabling or disabling features of a recipe on a per-recipe basis." | 311 | PACKAGECONFIG[doc] = "This variable provides a means of enabling or disabling features of a recipe on a per-recipe basis." |
diff --git a/meta/lib/oe/packagegroup.py b/meta/lib/oe/packagegroup.py index 2419cbb6d3..8fcaecde82 100644 --- a/meta/lib/oe/packagegroup.py +++ b/meta/lib/oe/packagegroup.py | |||
@@ -5,17 +5,11 @@ | |||
5 | import itertools | 5 | import itertools |
6 | 6 | ||
7 | def is_optional(feature, d): | 7 | def is_optional(feature, d): |
8 | packages = d.getVar("FEATURE_PACKAGES_%s" % feature) | 8 | return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional")) |
9 | if packages: | ||
10 | return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional")) | ||
11 | else: | ||
12 | return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional")) | ||
13 | 9 | ||
14 | def packages(features, d): | 10 | def packages(features, d): |
15 | for feature in features: | 11 | for feature in features: |
16 | packages = d.getVar("FEATURE_PACKAGES_%s" % feature) | 12 | packages = d.getVar("FEATURE_PACKAGES_%s" % feature) |
17 | if not packages: | ||
18 | packages = d.getVar("PACKAGE_GROUP_%s" % feature) | ||
19 | for pkg in (packages or "").split(): | 13 | for pkg in (packages or "").split(): |
20 | yield pkg | 14 | yield pkg |
21 | 15 | ||