summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2019-11-14 19:40:07 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-21 23:08:19 +0000
commit9702544b3e75d761d86cae7e8b36f3f2625b68ce (patch)
treeb8db1573283245d3f7d7c8d9fc32b9bd67c76f14 /meta/recipes-extended
parenta616ffebdc6f761635f351432461010de1890b7d (diff)
downloadpoky-9702544b3e75d761d86cae7e8b36f3f2625b68ce.tar.gz
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 <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/pam/libpam_1.3.1.bb2
-rw-r--r--meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb2
2 files changed, 2 insertions, 2 deletions
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() {
150 fi 150 fi
151} 151}
152 152
153inherit distro_features_check 153inherit features_check
154REQUIRED_DISTRO_FEATURES = "pam" 154REQUIRED_DISTRO_FEATURES = "pam"
155 155
156BBCLASSEXTEND = "nativesdk native" 156BBCLASSEXTEND = "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
28UPSTREAM_CHECK_REGEX = "xdg-utils-(?P<pver>((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)" 28UPSTREAM_CHECK_REGEX = "xdg-utils-(?P<pver>((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)"
29 29
30# Needs brokensep as this doesn't use automake 30# Needs brokensep as this doesn't use automake
31inherit autotools-brokensep distro_features_check 31inherit autotools-brokensep features_check
32 32
33# The xprop requires x11 in DISTRO_FEATURES 33# The xprop requires x11 in DISTRO_FEATURES
34REQUIRED_DISTRO_FEATURES = "x11" 34REQUIRED_DISTRO_FEATURES = "x11"