This was deprecated in 2014 so we can safely remove the old code now.
Signed-off-by: Richard Purdie <[email protected]>
---
meta/classes/image.bbclass | 5 +----
meta/conf/documentation.conf | 1 -
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 07aa1f1fa5b..694b58fc9f4 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -62,10 +62,7 @@ def check_image_features(d):
valid_features = (d.getVarFlag('IMAGE_FEATURES', 'validitems') or
"").split()
valid_features += d.getVarFlags('COMPLEMENTARY_GLOB').keys()
for var in d:
- if var.startswith("PACKAGE_GROUP_"):
- bb.warn("PACKAGE_GROUP is deprecated, please use FEATURE_PACKAGES
instead")
- valid_features.append(var[14:])
- elif var.startswith("FEATURE_PACKAGES_"):
+ if var.startswith("FEATURE_PACKAGES_"):
valid_features.append(var[17:])
valid_features.sort()
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 44d69197bf2..c6544b96981 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
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."
PACKAGE_EXCLUDE[doc] = "Packages to exclude from the installation. If a listed
package is required, an error is generated."
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."
-PACKAGE_GROUP[doc] = "Defines one or more packages to include in an image when
a specific item is included in IMAGE_FEATURES."
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."
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."
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 2419cbb6d34..8fcaecde822 100644
--- a/meta/lib/oe/packagegroup.py
+++ b/meta/lib/oe/packagegroup.py
@@ -5,17 +5,11 @@
import itertools
def is_optional(feature, d):
- packages = d.getVar("FEATURE_PACKAGES_%s" % feature)
- if packages:
- return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional"))
- else:
- return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional"))
+ return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional"))
def packages(features, d):
for feature in features:
packages = d.getVar("FEATURE_PACKAGES_%s" % feature)
- if not packages:
- packages = d.getVar("PACKAGE_GROUP_%s" % feature)
for pkg in (packages or "").split():
yield pkg
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#137569):
https://lists.openembedded.org/g/openembedded-core/message/137569
Mute This Topic: https://lists.openembedded.org/mt/73327851/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
