diff options
author | Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:50 +0100 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-05-05 11:41:28 -0400 |
commit | 275b6c30fbe4f2e6d8c607e9f2eedd5c230c0802 (patch) | |
tree | 4fd20a242b848ec8497066801b86706de3defdce /meta-networking/recipes-support/nis | |
parent | 7a9c626092c7d3b10206c7ca4ea2827cca9cba4f (diff) | |
download | meta-openembedded-275b6c30fbe4f2e6d8c607e9f2eedd5c230c0802.tar.gz |
meta-networking: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/nis')
-rw-r--r-- | meta-networking/recipes-support/nis/ypbind-mt_1.38.bb | 2 | ||||
-rw-r--r-- | meta-networking/recipes-support/nis/ypbind-mt_2.2.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb index d113b82e8..9fc6406b7 100644 --- a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb +++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb | |||
@@ -19,7 +19,7 @@ This is the final IPv4-only version of ypbind-mt. \ | |||
19 | HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" | 19 | HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" |
20 | DEPENDS = " \ | 20 | DEPENDS = " \ |
21 | yp-tools \ | 21 | yp-tools \ |
22 | ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ |
23 | " | 23 | " |
24 | RDEPENDS_${PN} += "yp-tools" | 24 | RDEPENDS_${PN} += "yp-tools" |
25 | 25 | ||
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb b/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb index cee5880f7..82544e759 100644 --- a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb +++ b/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb | |||
@@ -15,7 +15,7 @@ of known secure NIS server (/etc/yp.conf) Binds to \ | |||
15 | the server which answered as first. \ | 15 | the server which answered as first. \ |
16 | " | 16 | " |
17 | HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" | 17 | HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" |
18 | DEPENDS = "yp-tools ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 18 | DEPENDS = "yp-tools ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" |
19 | PROVIDES += "ypbind" | 19 | PROVIDES += "ypbind" |
20 | 20 | ||
21 | PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools" | 21 | PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools" |