diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-03-01 18:30:49 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-03-07 13:30:26 +0100 |
commit | 0c31f55bcfd6630d894dd2dda6ca483bea5de4ab (patch) | |
tree | 362ae6300bfa295709e24a4879639fb4c0fb5116 /meta-networking/recipes-support/dnsmasq | |
parent | b4524eb786472e69e28212a58a329a5e44e40547 (diff) | |
download | meta-openembedded-0c31f55bcfd6630d894dd2dda6ca483bea5de4ab.tar.gz |
Make use of the new bb.utils.filter() function
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support/dnsmasq')
-rw-r--r-- | meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index 424a06b32..ef79c5f82 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc | |||
@@ -53,7 +53,7 @@ do_install () { | |||
53 | 53 | ||
54 | install -d ${D}${systemd_unitdir}/system | 54 | install -d ${D}${systemd_unitdir}/system |
55 | 55 | ||
56 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then | 56 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then |
57 | install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service | 57 | install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service |
58 | else | 58 | else |
59 | install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service | 59 | install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service |
@@ -61,11 +61,11 @@ do_install () { | |||
61 | 61 | ||
62 | install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir} | 62 | install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir} |
63 | 63 | ||
64 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then | 64 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'dbus', d)}" ]; then |
65 | install -d ${D}${sysconfdir}/dbus-1/system.d | 65 | install -d ${D}${sysconfdir}/dbus-1/system.d |
66 | install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ | 66 | install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ |
67 | fi | 67 | fi |
68 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then | 68 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then |
69 | install -d ${D}${sysconfdir}/resolvconf/update.d/ | 69 | install -d ${D}${sysconfdir}/resolvconf/update.d/ |
70 | install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq | 70 | install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq |
71 | 71 | ||