diff options
author | Denys Dmytriyenko <denys@ti.com> | 2019-11-14 19:40:07 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-21 23:08:19 +0000 |
commit | 9702544b3e75d761d86cae7e8b36f3f2625b68ce (patch) | |
tree | b8db1573283245d3f7d7c8d9fc32b9bd67c76f14 /meta/recipes-graphics/xorg-font | |
parent | a616ffebdc6f761635f351432461010de1890b7d (diff) | |
download | poky-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-graphics/xorg-font')
-rw-r--r-- | meta/recipes-graphics/xorg-font/xorg-font-common.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc index cdbebcf788..f18c8aefc2 100644 --- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc | |||
@@ -14,7 +14,7 @@ INC_PR = "r2" | |||
14 | SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" | 14 | SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" |
15 | S = "${WORKDIR}/${XORG_PN}-${PV}" | 15 | S = "${WORKDIR}/${XORG_PN}-${PV}" |
16 | 16 | ||
17 | inherit autotools pkgconfig distro_features_check | 17 | inherit autotools pkgconfig features_check |
18 | 18 | ||
19 | # The mkfontscale-native requires x11 in DISTRO_FEATURES | 19 | # The mkfontscale-native requires x11 in DISTRO_FEATURES |
20 | REQUIRED_DISTRO_FEATURES = "x11" | 20 | REQUIRED_DISTRO_FEATURES = "x11" |
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb index 9bcd1b2fa6..1ea08a6c99 100644 --- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "file://misc" | |||
13 | PE = "1" | 13 | PE = "1" |
14 | PR = "r2" | 14 | PR = "r2" |
15 | 15 | ||
16 | inherit allarch distro_features_check | 16 | inherit allarch features_check |
17 | 17 | ||
18 | # The font-alias requires x11 in DISTRO_FEATURES | 18 | # The font-alias requires x11 in DISTRO_FEATURES |
19 | REQUIRED_DISTRO_FEATURES = "x11" | 19 | REQUIRED_DISTRO_FEATURES = "x11" |