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 21:17:40 +0000 |
commit | 5f4875b950ce199e91f99c8e945a0c709166dc14 (patch) | |
tree | 7815387574f0435cb3a571abc8bd5647c3e8ff4c /meta/recipes-gnome | |
parent | dfb3b566412fb704c5ce67c2dec74c5b1a20921f (diff) | |
download | openembedded-core-contrib-5f4875b950ce199e91f99c8e945a0c709166dc14.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.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r-- | meta/recipes-gnome/epiphany/epiphany_3.34.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/gcr/gcr_3.34.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/libnotify/libnotify_0.7.8.bb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb index d1cb515a58..cebd55dc87 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb @@ -8,7 +8,7 @@ DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ glib-2.0 glib-2.0-native json-glib libdazzle" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext +inherit gnomebase gsettings features_check upstream-version-is-even gettext REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ diff --git a/meta/recipes-gnome/gcr/gcr_3.34.0.bb b/meta/recipes-gnome/gcr/gcr_3.34.0.bb index 616b0e5bf5..e3e8999635 100644 --- a/meta/recipes-gnome/gcr/gcr_3.34.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.34.0.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" -inherit gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection gettext +inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext # depends on gtk+3, but also x11 through gtk+-x11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index dc6768c4e8..e1f1e0db31 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" -inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check gobject-introspection +inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings features_check gobject-introspection BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb b/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb index e2973905f8..1c8b2c86e0 100644 --- a/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb +++ b/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb @@ -8,7 +8,7 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libdazzle/issues" LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase upstream-version-is-even vala distro_features_check gobject-introspection +inherit gnomebase upstream-version-is-even vala features_check gobject-introspection DEPENDS = "glib-2.0-native glib-2.0 gtk+3" diff --git a/meta/recipes-gnome/libnotify/libnotify_0.7.8.bb b/meta/recipes-gnome/libnotify/libnotify_0.7.8.bb index f4cda7bc74..0306b04f4e 100644 --- a/meta/recipes-gnome/libnotify/libnotify_0.7.8.bb +++ b/meta/recipes-gnome/libnotify/libnotify_0.7.8.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" DEPENDS = "dbus gtk+3 glib-2.0" -inherit gnomebase gtk-doc distro_features_check gobject-introspection +inherit gnomebase gtk-doc features_check gobject-introspection # depends on gtk+3 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |