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-graphics/images/core-image-weston.bb | 2 +- meta/recipes-graphics/images/core-image-x11.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/images') diff --git a/meta/recipes-graphics/images/core-image-weston.bb b/meta/recipes-graphics/images/core-image-weston.bb index e36655ffc5..f5102e1989 100644 --- a/meta/recipes-graphics/images/core-image-weston.bb +++ b/meta/recipes-graphics/images/core-image-weston.bb @@ -4,7 +4,7 @@ IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs" LICENSE = "MIT" -inherit core-image distro_features_check +inherit core-image features_check REQUIRED_DISTRO_FEATURES = "wayland" diff --git a/meta/recipes-graphics/images/core-image-x11.bb b/meta/recipes-graphics/images/core-image-x11.bb index cd5374949d..52407759f9 100644 --- a/meta/recipes-graphics/images/core-image-x11.bb +++ b/meta/recipes-graphics/images/core-image-x11.bb @@ -4,7 +4,7 @@ IMAGE_FEATURES += "splash package-management x11-base" LICENSE = "MIT" -inherit core-image distro_features_check +inherit core-image features_check REQUIRED_DISTRO_FEATURES = "x11" -- cgit v1.2.3-54-g00ecf