diff options
Diffstat (limited to 'external/meta-openembedded/meta-networking/recipes-support/dnsmasq')
5 files changed, 15 insertions, 9 deletions
diff --git a/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index 4f4bbf14..33678e23 100644 --- a/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -12,6 +12,7 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV file://dnsmasq.conf \ file://dnsmasq-resolvconf.service \ file://dnsmasq-noresolvconf.service \ + file://dnsmasq-resolved.conf \ " inherit pkgconfig update-rc.d systemd @@ -58,6 +59,8 @@ do_install () { else install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service fi + install -d ${D}${sysconfdir}/systemd/resolved.conf.d/ + install -m 0644 ${WORKDIR}/dnsmasq-resolved.conf ${D}${sysconfdir}/systemd/resolved.conf.d/ install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir} diff --git a/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.79.bb b/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.79.bb deleted file mode 100644 index a66b9a9a..00000000 --- a/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.79.bb +++ /dev/null @@ -1,8 +0,0 @@ -require dnsmasq.inc - -SRC_URI[dnsmasq-2.79.md5sum] = "5d7120a46d0c16a334f46757d7e2ba55" -SRC_URI[dnsmasq-2.79.sha256sum] = "77512dd6f31ffd96718e8dcbbf54f02c083f051d4cca709bd32540aea269f789" -SRC_URI += "\ - file://lua.patch \ -" - diff --git a/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb b/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb new file mode 100644 index 00000000..92415386 --- /dev/null +++ b/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb @@ -0,0 +1,8 @@ +require dnsmasq.inc + +SRC_URI[dnsmasq-2.81.md5sum] = "e43808177a773014b5892ccba238f7a8" +SRC_URI[dnsmasq-2.81.sha256sum] = "3c28c68c6c2967c3a96e9b432c0c046a5df17a426d3a43cffe9e693cf05804d0" +SRC_URI += "\ + file://lua.patch \ +" + diff --git a/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolved.conf b/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolved.conf new file mode 100644 index 00000000..33f46496 --- /dev/null +++ b/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolved.conf @@ -0,0 +1,3 @@ +# Avoid conflicts between dnsmasq and systemd-resolved about port 53 +[Resolve] +DNSStubListener=no diff --git a/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf b/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf index 9e5ab9f8..2897b903 100755 --- a/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf +++ b/external/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf @@ -2,7 +2,7 @@ # # Format is one option per line, legal options are the same # as the long options legal on the command line. See -# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details. +# "/usr/bin/dnsmasq --help" or "man 8 dnsmasq" for details. # Listen on this specific port instead of the standard DNS port # (53). Setting this to zero completely disables DNS function, |