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-connectivity | |
| 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-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi-ui_0.7.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome_0.7.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb index 1c6e46aaba..1510a0ef4f 100644 --- a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb +++ b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require avahi.inc | 1 | require avahi.inc |
| 2 | 2 | ||
| 3 | inherit distro_features_check | 3 | inherit features_check |
| 4 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 4 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 5 | 5 | ||
| 6 | DEPENDS += "avahi" | 6 | DEPENDS += "avahi" |
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 1702323288..484509350b 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc | |||
| @@ -64,7 +64,7 @@ S = "${WORKDIR}/bluez-${PV}" | |||
| 64 | 64 | ||
| 65 | CVE_PRODUCT = "bluez" | 65 | CVE_PRODUCT = "bluez" |
| 66 | 66 | ||
| 67 | inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest gobject-introspection-data | 67 | inherit autotools pkgconfig systemd update-rc.d features_check ptest gobject-introspection-data |
| 68 | 68 | ||
| 69 | EXTRA_OECONF = "\ | 69 | EXTRA_OECONF = "\ |
| 70 | --enable-test \ | 70 | --enable-test \ |
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index a56bd3751f..778bf50191 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb | |||
| @@ -20,7 +20,7 @@ SRC_URI = "git://github.com/connectivity/connman-gnome.git \ | |||
| 20 | 20 | ||
| 21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
| 22 | 22 | ||
| 23 | inherit autotools-brokensep gtk-icon-cache pkgconfig distro_features_check | 23 | inherit autotools-brokensep gtk-icon-cache pkgconfig features_check |
| 24 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 24 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 25 | 25 | ||
| 26 | RDEPENDS_${PN} = "connman" | 26 | RDEPENDS_${PN} = "connman" |