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-lib | |
| 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-lib')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb index b0afc01dfd..9befc51b50 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb | |||
| @@ -25,7 +25,7 @@ PACKAGES_DYNAMIC = "^libxcb-.*" | |||
| 25 | 25 | ||
| 26 | FILES_${PN} = "${libdir}/libxcb.so.*" | 26 | FILES_${PN} = "${libdir}/libxcb.so.*" |
| 27 | 27 | ||
| 28 | inherit autotools pkgconfig distro_features_check | 28 | inherit autotools pkgconfig features_check |
| 29 | 29 | ||
| 30 | # The libxau and others requires x11 in DISTRO_FEATURES | 30 | # The libxau and others requires x11 in DISTRO_FEATURES |
| 31 | REQUIRED_DISTRO_FEATURES = "x11" | 31 | REQUIRED_DISTRO_FEATURES = "x11" |
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util.inc b/meta/recipes-graphics/xorg-lib/xcb-util.inc index 99d04f9d44..0e5ab70b2d 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util.inc +++ b/meta/recipes-graphics/xorg-lib/xcb-util.inc | |||
| @@ -18,6 +18,6 @@ DEPENDS += "gperf-native" | |||
| 18 | 18 | ||
| 19 | SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2" | 19 | SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2" |
| 20 | 20 | ||
| 21 | inherit autotools pkgconfig distro_features_check | 21 | inherit autotools pkgconfig features_check |
| 22 | 22 | ||
| 23 | REQUIRED_DISTRO_FEATURES = "x11" | 23 | REQUIRED_DISTRO_FEATURES = "x11" |
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index 09df0109cb..a566eaa45e 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | |||
| @@ -11,7 +11,7 @@ SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" | |||
| 11 | 11 | ||
| 12 | S = "${WORKDIR}/${XORG_PN}-${PV}" | 12 | S = "${WORKDIR}/${XORG_PN}-${PV}" |
| 13 | 13 | ||
| 14 | inherit autotools distro_features_check pkgconfig | 14 | inherit autotools features_check pkgconfig |
| 15 | 15 | ||
| 16 | EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop" | 16 | EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop" |
| 17 | 17 | ||