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-support | |
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-support')
-rw-r--r-- | meta/recipes-support/atk/at-spi2-atk_2.32.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/consolekit/consolekit_0.4.6.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/libfm/libfm_1.3.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/vte/vte_0.58.2.bb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb index bcf1c9c77a..d3a9de1e41 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb | |||
@@ -9,7 +9,7 @@ SRC_URI[archive.sha256sum] = "0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047 | |||
9 | DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" | 9 | DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" |
10 | 10 | ||
11 | GNOMEBASEBUILDCLASS = "meson" | 11 | GNOMEBASEBUILDCLASS = "meson" |
12 | inherit gnomebase distro_features_check upstream-version-is-even | 12 | inherit gnomebase features_check upstream-version-is-even |
13 | 13 | ||
14 | PACKAGES =+ "${PN}-gnome ${PN}-gtk2" | 14 | PACKAGES =+ "${PN}-gnome ${PN}-gtk2" |
15 | 15 | ||
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb index a17f739d4d..89f2d77b66 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | |||
9 | DEPENDS = "glib-2.0 glib-2.0-native dbus dbus-glib virtual/libx11" | 9 | DEPENDS = "glib-2.0 glib-2.0-native dbus dbus-glib virtual/libx11" |
10 | RDEPENDS_${PN} += "base-files" | 10 | RDEPENDS_${PN} += "base-files" |
11 | 11 | ||
12 | inherit autotools pkgconfig distro_features_check | 12 | inherit autotools pkgconfig features_check |
13 | # depends on virtual/libx11 | 13 | # depends on virtual/libx11 |
14 | REQUIRED_DISTRO_FEATURES = "x11" | 14 | REQUIRED_DISTRO_FEATURES = "x11" |
15 | 15 | ||
diff --git a/meta/recipes-support/libfm/libfm_1.3.1.bb b/meta/recipes-support/libfm/libfm_1.3.1.bb index 65a6f8e78c..918fe3ece7 100644 --- a/meta/recipes-support/libfm/libfm_1.3.1.bb +++ b/meta/recipes-support/libfm/libfm_1.3.1.bb | |||
@@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ | |||
19 | SRC_URI[md5sum] = "c15ecd2c9317e2c385cd3f046d0b61ba" | 19 | SRC_URI[md5sum] = "c15ecd2c9317e2c385cd3f046d0b61ba" |
20 | SRC_URI[sha256sum] = "96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4" | 20 | SRC_URI[sha256sum] = "96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4" |
21 | 21 | ||
22 | inherit autotools pkgconfig gtk-doc gettext distro_features_check | 22 | inherit autotools pkgconfig gtk-doc gettext features_check |
23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
24 | 24 | ||
25 | EXTRA_OECONF = "--with-gtk=3" | 25 | EXTRA_OECONF = "--with-gtk=3" |
diff --git a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb index 244d9e204e..074f713205 100644 --- a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb +++ b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${P | |||
12 | SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f" | 12 | SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f" |
13 | SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67e7caf2" | 13 | SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67e7caf2" |
14 | 14 | ||
15 | inherit autotools distro_features_check | 15 | inherit autotools features_check |
16 | 16 | ||
17 | COMPATIBLE_HOST_libc-musl = 'null' | 17 | COMPATIBLE_HOST_libc-musl = 'null' |
18 | 18 | ||
diff --git a/meta/recipes-support/vte/vte_0.58.2.bb b/meta/recipes-support/vte/vte_0.58.2.bb index 9e27f6978d..0ed382a5f9 100644 --- a/meta/recipes-support/vte/vte_0.58.2.bb +++ b/meta/recipes-support/vte/vte_0.58.2.bb | |||
@@ -14,7 +14,7 @@ DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native" | |||
14 | GNOMEBASEBUILDCLASS = "meson" | 14 | GNOMEBASEBUILDCLASS = "meson" |
15 | GIR_MESON_OPTION = 'gir' | 15 | GIR_MESON_OPTION = 'gir' |
16 | 16 | ||
17 | inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection | 17 | inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection |
18 | 18 | ||
19 | # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) | 19 | # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) |
20 | SRC_URI += "file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \ | 20 | SRC_URI += "file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \ |