Patchwork [meta-oe,2/2] meta-networking: stylize dnsmasq recipe

login
register
mail settings
Submitter Joe MacDonald
Date Sept. 3, 2012, 12:50 a.m.
Message ID <1346633420-10990-3-git-send-email-joe.macdonald@windriver.com>
Download mbox | patch
Permalink /patch/35643/
State Rejected, archived
Headers show

Comments

Joe MacDonald - Sept. 3, 2012, 12:50 a.m.
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
---
 .../recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb           | 10 +++++-----
 meta-networking/recipes-daemons/dnsmasq/dnsmasq.inc        | 14 +++++++-------
 meta-networking/recipes-daemons/dnsmasq/dnsmasq_2.55.bb    |  3 ++-
 3 files changed, 14 insertions(+), 13 deletions(-)
Koen Kooi - Sept. 3, 2012, 6:06 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 03-09-12 02:50, Joe MacDonald schreef:
> Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> --- 
> .../recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb           | 10
> +++++----- meta-networking/recipes-daemons/dnsmasq/dnsmasq.inc        |
> 14 +++++++------- meta-networking/recipes-daemons/dnsmasq/dnsmasq_2.55.bb
> |  3 ++- 3 files changed, 14 insertions(+), 13 deletions(-)
> 
> diff --git a/meta-networking/recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb
> b/meta-networking/recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb index
> 896952d..5c4500f 100644 ---
> a/meta-networking/recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb +++
> b/meta-networking/recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb @@ -1,13
> +1,13 @@ # dnsmasq with support for DBus interface - -require
> dnsmasq_${PV}.bb +DEPENDS = "dbus"
> 
> S = "${WORKDIR}/dnsmasq-${PV}"
> 
> -DEPENDS = "dbus" EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS"
> 
> do_install_append () { -        install -d
> ${D}${sysconfdir}/dbus-1/system.d -        install -m 644
> dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ +    install -d
> ${D}${sysconfdir}/dbus-1/system.d +    install -m 644 dbus/dnsmasq.conf
> ${D}${sysconfdir}/dbus-1/system.d/ } + +require dnsmasq_${PV}.bb

The require should remain on top by the looks of it

> diff --git a/meta-networking/recipes-daemons/dnsmasq/dnsmasq.inc
> b/meta-networking/recipes-daemons/dnsmasq/dnsmasq.inc index
> e994852..3c87abf 100644 ---
> a/meta-networking/recipes-daemons/dnsmasq/dnsmasq.inc +++
> b/meta-networking/recipes-daemons/dnsmasq/dnsmasq.inc @@ -17,13 +17,13 @@
> INITSCRIPT_NAME = "dnsmasq" INITSCRIPT_PARAMS = "defaults"
> 
> do_install () { -        oe_runmake "PREFIX=${D}${prefix}" \ -
> "BINDIR=${D}${bindir}" \ -                   "MANDIR=${D}${mandir}" \ -
> install -        install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d
> ${D}${sysconfdir}/dnsmasq.d -        install -m 644
> ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/ -        install -m 755
> ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq +    oe_runmake
> "PREFIX=${D}${prefix}" \ +               "BINDIR=${D}${bindir}" \ +
> "MANDIR=${D}${mandir}" \ +               install +    install -d
> ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d +
> install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/ +    install -m
> 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq }
> 
> CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf" diff --git
> a/meta-networking/recipes-daemons/dnsmasq/dnsmasq_2.55.bb
> b/meta-networking/recipes-daemons/dnsmasq/dnsmasq_2.55.bb index
> 5f87704..e98f61c 100644 ---
> a/meta-networking/recipes-daemons/dnsmasq/dnsmasq_2.55.bb +++
> b/meta-networking/recipes-daemons/dnsmasq/dnsmasq_2.55.bb @@ -1,4 +1,5
> @@ -require dnsmasq.inc
> 
> SRC_URI[dnsmasq-2.55.md5sum] = "b093d7c6bc7f97ae6fd35d048529232a" 
> SRC_URI[dnsmasq-2.55.sha256sum] =
> "cf63ecf5977f00474cbda98376a9d8743500a82fd98e13f43d7037bce9f9f929" + 
> +require dnsmasq.inc
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQREkDMkyGM64RGpERAlR8AKC4IFFZEdpWSKGRXgSmXbIkALNU0QCePCWY
Es2gc0ph/ZPH/Kqcmg7syrM=
=EbfW
-----END PGP SIGNATURE-----

Patch

diff --git a/meta-networking/recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb b/meta-networking/recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb
index 896952d..5c4500f 100644
--- a/meta-networking/recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb
+++ b/meta-networking/recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb
@@ -1,13 +1,13 @@ 
 # dnsmasq with support for DBus interface
-
-require dnsmasq_${PV}.bb
+DEPENDS = "dbus"
 
 S = "${WORKDIR}/dnsmasq-${PV}"
 
-DEPENDS = "dbus"
 EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS"
 
 do_install_append () {
-        install -d ${D}${sysconfdir}/dbus-1/system.d
-        install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/
+    install -d ${D}${sysconfdir}/dbus-1/system.d
+    install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/
 }
+
+require dnsmasq_${PV}.bb
diff --git a/meta-networking/recipes-daemons/dnsmasq/dnsmasq.inc b/meta-networking/recipes-daemons/dnsmasq/dnsmasq.inc
index e994852..3c87abf 100644
--- a/meta-networking/recipes-daemons/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-daemons/dnsmasq/dnsmasq.inc
@@ -17,13 +17,13 @@  INITSCRIPT_NAME = "dnsmasq"
 INITSCRIPT_PARAMS = "defaults"
 
 do_install () {
-        oe_runmake "PREFIX=${D}${prefix}" \
-                   "BINDIR=${D}${bindir}" \
-                   "MANDIR=${D}${mandir}" \
-                   install
-        install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d
-        install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/
-        install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
+    oe_runmake "PREFIX=${D}${prefix}" \
+               "BINDIR=${D}${bindir}" \
+               "MANDIR=${D}${mandir}" \
+               install
+    install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d
+    install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/
+    install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
 }
 
 CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf"
diff --git a/meta-networking/recipes-daemons/dnsmasq/dnsmasq_2.55.bb b/meta-networking/recipes-daemons/dnsmasq/dnsmasq_2.55.bb
index 5f87704..e98f61c 100644
--- a/meta-networking/recipes-daemons/dnsmasq/dnsmasq_2.55.bb
+++ b/meta-networking/recipes-daemons/dnsmasq/dnsmasq_2.55.bb
@@ -1,4 +1,5 @@ 
-require dnsmasq.inc
 
 SRC_URI[dnsmasq-2.55.md5sum] = "b093d7c6bc7f97ae6fd35d048529232a"
 SRC_URI[dnsmasq-2.55.sha256sum] = "cf63ecf5977f00474cbda98376a9d8743500a82fd98e13f43d7037bce9f9f929"
+
+require dnsmasq.inc