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

Joe MacDonald joe.macdonald at windriver.com
Mon Sep 3 00:50:20 UTC 2012


Signed-off-by: Joe MacDonald <joe.macdonald at 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
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
-- 
1.7.11.3





More information about the Openembedded-devel mailing list