diff options
author | Terry Boese <terry.boese@vecima.com> | 2016-08-15 11:00:36 -0600 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-08-16 21:26:12 -0400 |
commit | 10a106616eed2d35f88fc676e8fe84fec27de9a3 (patch) | |
tree | 95d36ef35a1b4d06ff8b8760d611df62ea34df26 /meta-networking | |
parent | e86c7ef20f90813146a565e9e9f5912d9a6c7b42 (diff) | |
download | meta-openembedded-10a106616eed2d35f88fc676e8fe84fec27de9a3.tar.gz |
dnsmasq: update to version 2.76
Correct do_compile_append() and do_install(), as the location of
the DHCP lease tools has changed.
Signed-off-by: Terry Boese <terry.boese@vecima.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 4 | ||||
-rw-r--r-- | meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb | 9 | ||||
-rw-r--r-- | meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb | 8 |
3 files changed, 10 insertions, 11 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index 793c106aa..9ef54fe17 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc | |||
@@ -38,7 +38,7 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'file://dnsmasq. | |||
38 | 38 | ||
39 | do_compile_append() { | 39 | do_compile_append() { |
40 | # build dhcp_release | 40 | # build dhcp_release |
41 | cd ${S}/contrib/wrt | 41 | cd ${S}/contrib/lease-tools |
42 | oe_runmake | 42 | oe_runmake |
43 | } | 43 | } |
44 | 44 | ||
@@ -59,7 +59,7 @@ do_install () { | |||
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 |
60 | fi | 60 | fi |
61 | 61 | ||
62 | install -m 0755 ${S}/contrib/wrt/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.contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then |
65 | install -d ${D}${sysconfdir}/dbus-1/system.d | 65 | install -d ${D}${sysconfdir}/dbus-1/system.d |
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb deleted file mode 100644 index a11aabbd9..000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | require dnsmasq.inc | ||
2 | |||
3 | SRC_URI += "\ | ||
4 | file://lua.patch \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[dnsmasq-2.75.md5sum] = "d99ac126d4fe910c679d88430559669b" | ||
8 | SRC_URI[dnsmasq-2.75.sha256sum] = "f8252c0a0ba162c2cd45f81140c7c17cc40a5fca2b869d1a420835b74acad294" | ||
9 | |||
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb new file mode 100644 index 000000000..41573d9dd --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require dnsmasq.inc | ||
2 | |||
3 | SRC_URI += "\ | ||
4 | file://lua.patch \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[dnsmasq-2.76.md5sum] = "6610f8233ca89b15a1bb47c788ffb84f" | ||
8 | SRC_URI[dnsmasq-2.76.sha256sum] = "777c4762d2fee3738a0380401f2d087b47faa41db2317c60660d69ad10a76c32" | ||