From ffb5434823195cbdc41c76a110eaa6ae04e2b010 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 4 Nov 2013 00:49:41 -0500 Subject: dnsmasq: uprev to 2.6.3 A minimum dnsmasq version of 2.5.9 is required deal with IPv6 link local addresses. So instead of just going to the minimum version, we can go all the way to 2.6.3. As part of this update, the following changes have been made in addition to the pure version update: - PR is dropped in favour of PRSERVER functionality - dhcp_release is added to the default build, since it is used in the cleanup phase for virtual machines. Signed-off-by: Bruce Ashfield Signed-off-by: Joe MacDonald --- meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 8 ++++++++ meta-networking/recipes-support/dnsmasq/dnsmasq_2.55.bb | 6 ------ meta-networking/recipes-support/dnsmasq/dnsmasq_2.63.bb | 4 ++++ 3 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.55.bb create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.63.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index 0f5b27325a..e57ab727eb 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -22,6 +22,12 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[dbus] = "COPTS=-DHAVE_DBUS,,dbus" EXTRA_OEMAKE = "${EXTRA_OECONF}" +do_compile_append() { + # build dhcp_release + cd ${S}/contrib/wrt + oe_runmake +} + do_install () { oe_runmake "PREFIX=${D}${prefix}" \ "BINDIR=${D}${bindir}" \ @@ -34,6 +40,8 @@ do_install () { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system + install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir} + if [ "${@base_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/ diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.55.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.55.bb deleted file mode 100644 index ae37db7391..0000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.55.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dnsmasq.inc - -PR = "r3" - -SRC_URI[dnsmasq-2.55.md5sum] = "b093d7c6bc7f97ae6fd35d048529232a" -SRC_URI[dnsmasq-2.55.sha256sum] = "cf63ecf5977f00474cbda98376a9d8743500a82fd98e13f43d7037bce9f9f929" diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.63.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.63.bb new file mode 100644 index 0000000000..2df3713909 --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.63.bb @@ -0,0 +1,4 @@ +require dnsmasq.inc + +SRC_URI[dnsmasq-2.63.md5sum] = "43e771997615ebcd8f6c6ffa60c3e40b" +SRC_URI[dnsmasq-2.63.sha256sum] = "fd86e3bcc6a63c76e35e4a20baa790e7bbbfc7b43845cae85ca8ffd024467710" -- cgit v1.2.3-54-g00ecf