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/packagegroups | |
| 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/packagegroups')
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb index 87c700e023..2e7b47dd40 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb | |||
| @@ -6,7 +6,7 @@ SUMMARY = "Clutter package groups" | |||
| 6 | 6 | ||
| 7 | PR = "r6" | 7 | PR = "r6" |
| 8 | 8 | ||
| 9 | inherit packagegroup distro_features_check | 9 | inherit packagegroup features_check |
| 10 | # rdepends on clutter-* | 10 | # rdepends on clutter-* |
| 11 | REQUIRED_DISTRO_FEATURES = "opengl" | 11 | REQUIRED_DISTRO_FEATURES = "opengl" |
| 12 | 12 | ||
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb index 7ea72d55a7..9ca2705a5f 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "Basic X11 session" | |||
| 2 | DESCRIPTION = "Packages required to set up a basic working X11 session" | 2 | DESCRIPTION = "Packages required to set up a basic working X11 session" |
| 3 | PR = "r1" | 3 | PR = "r1" |
| 4 | 4 | ||
| 5 | inherit packagegroup distro_features_check | 5 | inherit packagegroup features_check |
| 6 | # rdepends on matchbox-wm | 6 | # rdepends on matchbox-wm |
| 7 | REQUIRED_DISTRO_FEATURES = "x11" | 7 | REQUIRED_DISTRO_FEATURES = "x11" |
| 8 | 8 | ||
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb index 97dcac5f79..a0b944a678 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb | |||
| @@ -7,7 +7,7 @@ PR = "r40" | |||
| 7 | 7 | ||
| 8 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 8 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 9 | 9 | ||
| 10 | inherit packagegroup distro_features_check | 10 | inherit packagegroup features_check |
| 11 | # rdepends on XSERVER | 11 | # rdepends on XSERVER |
| 12 | REQUIRED_DISTRO_FEATURES = "x11" | 12 | REQUIRED_DISTRO_FEATURES = "x11" |
| 13 | 13 | ||
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index 001db9e5e2..cddf1932f3 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | PR = "r40" | 5 | PR = "r40" |
| 6 | 6 | ||
| 7 | inherit packagegroup distro_features_check | 7 | inherit packagegroup features_check |
| 8 | REQUIRED_DISTRO_FEATURES = "x11" | 8 | REQUIRED_DISTRO_FEATURES = "x11" |
| 9 | 9 | ||
| 10 | PACKAGES = "${PN} ${PN}-utils" | 10 | PACKAGES = "${PN} ${PN}-utils" |