From 9702544b3e75d761d86cae7e8b36f3f2625b68ce Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 14 Nov 2019 19:40:07 -0500 Subject: distro_features_check: expand with MACHINE_FEATURES and COMBINED_FEATURES, rename Besides checking DISTRO_FEATURES for required or conflicting features, being able to check MACHINE_FEATURES and/or COMBINED_FEATURES may also be useful at times. Temporarily support the old class name with a warning about future deprecation. (From OE-Core rev: 5f4875b950ce199e91f99c8e945a0c709166dc14) Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- meta/recipes-extended/pam/libpam_1.3.1.bb | 2 +- meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/pam/libpam_1.3.1.bb b/meta/recipes-extended/pam/libpam_1.3.1.bb index a2aa1ecd16..1194933827 100644 --- a/meta/recipes-extended/pam/libpam_1.3.1.bb +++ b/meta/recipes-extended/pam/libpam_1.3.1.bb @@ -150,7 +150,7 @@ do_install() { fi } -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" BBCLASSEXTEND = "nativesdk native" diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb index 8e46638197..7788b5f3c3 100644 --- a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb +++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb @@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d UPSTREAM_CHECK_REGEX = "xdg-utils-(?P((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)" # Needs brokensep as this doesn't use automake -inherit autotools-brokensep distro_features_check +inherit autotools-brokensep features_check # The xprop requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" -- cgit v1.2.3-54-g00ecf