[meta-networking][PATCH 0/2]: meta-virtualization derived updates

[meta-networking][PATCH 0/2]: meta-virtualization derived updates

[Bruce Ashfield]

Joe,

Here are a couple of changes that I've pulled out of the various layers that
I've been testing and looking after.

One is an uprev to dnsmasq to 2.63, and the other is a recipe from meta-virtualization
that is a better fit in meta-networking.

I tweaked both the recipes slightly as part of updating them for submission to
meta-networking, and documented the tweaks in the patches themselves. 

Anyway, have a look, and let me know what additional changes you'd like made
to the recipes.

Cheers,

Bruce


Bruce Ashfield (2):
  dnsmasq: uprev to 2.6.3
  netcf: move from meta-virtualization to meta-networking

 .../recipes-support/dnsmasq/dnsmasq.inc            |  8 +++++++
 .../recipes-support/dnsmasq/dnsmasq_2.55.bb        |  6 ------
 .../recipes-support/dnsmasq/dnsmasq_2.63.bb        |  4 ++++
 meta-networking/recipes-support/netcf/netcf_git.bb | 25 ++++++++++++++++++++++
 4 files changed, 37 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
 create mode 100644 meta-networking/recipes-support/netcf/netcf_git.bb

-- 
1.8.1.2

[meta-networking][PATCH 1/2] dnsmasq: uprev to 2.6.3

[Bruce Ashfield]

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

[meta-networking][PATCH 2/2] netcf: move from meta-virtualization to meta-networking

[Bruce Ashfield]

netcf was orginally introduced in meta-virtualization, since it provides
functionality required by libvirt, but it is otherwise not bound to
virtualization.

So we can move it to meta-networking, and in the process uprev to the
the latest 0.2.3 functinality.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-networking/recipes-support/netcf/netcf_git.bb | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 meta-networking/recipes-support/netcf/netcf_git.bb

diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb b/meta-networking/recipes-support/netcf/netcf_git.bb
new file mode 100644
index 0000000..60d82d1
--- /dev/null
+++ b/meta-networking/recipes-support/netcf/netcf_git.bb
@@ -0,0 +1,25 @@
+SUMMARY = "netcf"
+DESCRIPTION = "netcf is a cross-platform network configuration library."
+HOMEPAGE = "https://fedorahosted.org/netcf/"
+SECTION = "console/tools"
+LICENSE = "LGPLv2.1"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
+
+SRCREV = "b8a19dc860b38c97c42115d8a559b78853452a4b"
+PV = "0.2.3+git${SRCPV}"
+
+SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \
+"
+
+DEPENDS += "augeas libnl libxslt libxml2"
+
+S = "${WORKDIR}/git"
+
+inherit gettext autotools
+
+do_configure_prepend() {
+	cd ${S}
+	./bootstrap
+}
+
-- 
1.8.1.2

Re: [meta-networking][PATCH 0/2]: meta-virtualization derived updates

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1427 bytes --]

Merged, thanks.
-J.

[[meta-networking][PATCH 0/2]: meta-virtualization derived updates] On 13.11.04 (Mon 00:49) Bruce Ashfield wrote:

> Joe,
> 
> Here are a couple of changes that I've pulled out of the various layers that
> I've been testing and looking after.
> 
> One is an uprev to dnsmasq to 2.63, and the other is a recipe from meta-virtualization
> that is a better fit in meta-networking.
> 
> I tweaked both the recipes slightly as part of updating them for submission to
> meta-networking, and documented the tweaks in the patches themselves. 
> 
> Anyway, have a look, and let me know what additional changes you'd like made
> to the recipes.
> 
> Cheers,
> 
> Bruce
> 
> 
> Bruce Ashfield (2):
>   dnsmasq: uprev to 2.6.3
>   netcf: move from meta-virtualization to meta-networking
> 
>  .../recipes-support/dnsmasq/dnsmasq.inc            |  8 +++++++
>  .../recipes-support/dnsmasq/dnsmasq_2.55.bb        |  6 ------
>  .../recipes-support/dnsmasq/dnsmasq_2.63.bb        |  4 ++++
>  meta-networking/recipes-support/netcf/netcf_git.bb | 25 ++++++++++++++++++++++
>  4 files changed, 37 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
>  create mode 100644 meta-networking/recipes-support/netcf/netcf_git.bb
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]