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-daemons/dnrd/dnrd_2.20.3.bb | |
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-daemons/dnrd/dnrd_2.20.3.bb')
-rw-r--r-- | meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb b/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb index 8769e5294..b5851a959 100644 --- a/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb +++ b/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb | |||
@@ -22,7 +22,7 @@ SYSTEMD_SERVICE_${PN} = "dnrd.service" | |||
22 | SYSTEMD_AUTO_ENABLE = "disable" | 22 | SYSTEMD_AUTO_ENABLE = "disable" |
23 | 23 | ||
24 | inherit autotools | 24 | inherit autotools |
25 | inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} | 25 | inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} |
26 | 26 | ||
27 | do_install() { | 27 | do_install() { |
28 | oe_runmake install DESTDIR=${D} INSTALL="install -p" | 28 | oe_runmake install DESTDIR=${D} INSTALL="install -p" |
@@ -34,7 +34,7 @@ do_install() { | |||
34 | install -p -m 0644 ${WORKDIR}/dnrd.conf.sample ${D}${sysconfdir}/dnrd/dnrd.conf | 34 | install -p -m 0644 ${WORKDIR}/dnrd.conf.sample ${D}${sysconfdir}/dnrd/dnrd.conf |
35 | install -p -m 0755 ${WORKDIR}/dnrd.init ${D}${sysconfdir}/init.d/dnrd | 35 | install -p -m 0755 ${WORKDIR}/dnrd.init ${D}${sysconfdir}/init.d/dnrd |
36 | 36 | ||
37 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 37 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
38 | install -d -m 0755 ${D}${systemd_unitdir}/system | 38 | install -d -m 0755 ${D}${systemd_unitdir}/system |
39 | install -m 644 ${WORKDIR}/dnrd.service ${D}${systemd_unitdir}/system | 39 | install -m 644 ${WORKDIR}/dnrd.service ${D}${systemd_unitdir}/system |
40 | fi | 40 | fi |