From a98d9c5b7141d3d22cd324ecd4c5127aa78f2ab5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 28 Apr 2020 15:11:10 +0100 Subject: image/packagegroup: Remove PACKAGE_GROUP_*, long since deprecated This was deprecated in 2014 so we can safely remove the old code now. (From OE-Core rev: fe1b79188cbe8159a0950f0c02d7f476a6694a04) Signed-off-by: Richard Purdie --- meta/lib/oe/packagegroup.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'meta/lib') 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 @@ 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 -- cgit v1.2.3-54-g00ecf