From: Bruce Ashfield <bruce.ashfield@windriver.com>
To: <joe@deserted.net>
Cc: openembedded-devel@lists.openembedded.org
Subject: [meta-networking][PATCH 1/2] dnsmasq: uprev to 2.6.3
Date: Mon, 4 Nov 2013 00:49:41 -0500 [thread overview]
Message-ID: <1383544182-12671-2-git-send-email-bruce.ashfield@windriver.com> (raw)
In-Reply-To: <1383544182-12671-1-git-send-email-bruce.ashfield@windriver.com>
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 <bruce.ashfield@windriver.com>
---
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
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index 0f5b273..e57ab72 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 ae37db7..0000000
--- 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 0000000..2df3713
--- /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"
--
1.8.1.2
next prev parent reply other threads:[~2013-11-04 5:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-04 5:49 [meta-networking][PATCH 0/2]: meta-virtualization derived updates Bruce Ashfield
2013-11-04 5:49 ` Bruce Ashfield [this message]
2013-11-04 5:49 ` [meta-networking][PATCH 2/2] netcf: move from meta-virtualization to meta-networking Bruce Ashfield
2013-11-06 20:42 ` [meta-networking][PATCH 0/2]: meta-virtualization derived updates Joe MacDonald
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383544182-12671-2-git-send-email-bruce.ashfield@windriver.com \
--to=bruce.ashfield@windriver.com \
--cc=joe@deserted.net \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox