On Thu, Aug 11, 2016 at 08:07:59AM -0600, Terry Boese wrote: > Change 'basecontains' to 'bb.utils.contain' to avoid warning.
That was already changed 4 months ago, please rebase and test in recent master before sending. > Correct do_compile_append(), as the location of the DHCP lease > tools has changed. > > Signed-off-by: Terry Boese <terry.bo...@vecima.com> > --- > meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 18 > +++++++++--------- > .../dnsmasq/{dnsmasq_2.75.bb => dnsmasq_2.76.bb} | 5 ++--- > 2 files changed, 11 insertions(+), 12 deletions(-) > rename meta-networking/recipes-support/dnsmasq/{dnsmasq_2.75.bb => > dnsmasq_2.76.bb} (27%) > > diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc > b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc > index cc7f9e3..9ef54fe 100644 > --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc > +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc > @@ -26,10 +26,10 @@ PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack" > PACKAGECONFIG[lua] = ",,lua" > PACKAGECONFIG[resolvconf] = ",,,resolvconf" > EXTRA_OEMAKE = "\ > - 'COPTS=${@base_contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ > - ${@base_contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ > - ${@base_contains('PACKAGECONFIG', 'conntrack', > '-DHAVE_CONNTRACK', '', d)} \ > - ${@base_contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', > d)}' \ > + 'COPTS=${@bb.utils.contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', > d)} \ > + ${@bb.utils.contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', > d)} \ > + ${@bb.utils.contains('PACKAGECONFIG', 'conntrack', > '-DHAVE_CONNTRACK', '', d)} \ > + ${@bb.utils.contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', > '', d)}' \ > 'CFLAGS=${CFLAGS}' \ > 'LDFLAGS=${LDFLAGS}' \ > " > @@ -38,7 +38,7 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', > 'resolvconf', 'file://dnsmasq. > > do_compile_append() { > # build dhcp_release > - cd ${S}/contrib/wrt > + cd ${S}/contrib/lease-tools > oe_runmake > } > > @@ -53,19 +53,19 @@ do_install () { > > install -d ${D}${systemd_unitdir}/system > > - if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', > d)}" != "" ]; then > + if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', > '', d)}" != "" ]; then > install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service > ${D}${systemd_unitdir}/system/dnsmasq.service > else > install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service > ${D}${systemd_unitdir}/system/dnsmasq.service > fi > > - install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir} > + install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir} > > - if [ "${@base_contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" > ]; then > + if [ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != > "" ]; then > install -d ${D}${sysconfdir}/dbus-1/system.d > install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ > fi > - if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', > d)}" != "" ]; then > + if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', > '', d)}" != "" ]; then > install -d ${D}${sysconfdir}/resolvconf/update.d/ > install -m 0755 ${WORKDIR}/dnsmasq.resolvconf > ${D}${sysconfdir}/resolvconf/update.d/dnsmasq > > diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb > b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb > similarity index 27% > rename from meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb > rename to meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb > index a11aabb..41573d9 100644 > --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb > +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb > @@ -4,6 +4,5 @@ SRC_URI += "\ > file://lua.patch \ > " > > -SRC_URI[dnsmasq-2.75.md5sum] = "d99ac126d4fe910c679d88430559669b" > -SRC_URI[dnsmasq-2.75.sha256sum] = > "f8252c0a0ba162c2cd45f81140c7c17cc40a5fca2b869d1a420835b74acad294" > - > +SRC_URI[dnsmasq-2.76.md5sum] = "6610f8233ca89b15a1bb47c788ffb84f" > +SRC_URI[dnsmasq-2.76.sha256sum] = > "777c4762d2fee3738a0380401f2d087b47faa41db2317c60660d69ad10a76c32" > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel