From e4e140c8e3a7eed8a3385d6ff6339245b43f600f Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 16 Apr 2013 10:54:00 +0000 Subject: [PATCH] dnsmasq: move to meta-networking and tweak * Make dbus a PACKAGECONFIG option and remove dnsmasq-dbus recipe * Set LICENSE to correctly indicate choice of licenses * Set SUMMARY instead of DESCRIPTION (From meta-openembedded rev: d48c95da5873a5674c264f788c0f1dda12025a25) Signed-off-by: Paul Eggleton Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../recipes-support}/dnsmasq/dnsmasq.inc | 13 +++++++++++-- .../recipes-support}/dnsmasq/dnsmasq_2.55.bb | 0 .../recipes-support}/dnsmasq/files/dnsmasq.conf | 0 .../recipes-support}/dnsmasq/files/dnsmasq.service | 0 .../recipes-support}/dnsmasq/files/init | 0 .../recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb | 13 ------------- 6 files changed, 11 insertions(+), 15 deletions(-) rename meta-openembedded/{meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/dnsmasq.inc (76%) rename meta-openembedded/{meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/dnsmasq_2.55.bb (100%) rename meta-openembedded/{meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/files/dnsmasq.conf (100%) rename meta-openembedded/{meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/files/dnsmasq.service (100%) rename meta-openembedded/{meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/files/init (100%) delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb diff --git a/meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc similarity index 76% rename from meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index 46188a4..0f5b273 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -1,8 +1,8 @@ -DESCRIPTION = "Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server." +SUMMARY = "Lightweight, easy to configure DNS forwarder and DHCP server" HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html" SECTION = "console/network" # GPLv3 was added in version 2.41 as license option -LICENSE = "GPLv2 GPLv3" +LICENSE = "GPLv2 | GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504" @@ -18,6 +18,10 @@ inherit update-rc.d systemd INITSCRIPT_NAME = "dnsmasq" INITSCRIPT_PARAMS = "defaults" +PACKAGECONFIG ??= "" +PACKAGECONFIG[dbus] = "COPTS=-DHAVE_DBUS,,dbus" +EXTRA_OEMAKE = "${EXTRA_OECONF}" + do_install () { oe_runmake "PREFIX=${D}${prefix}" \ "BINDIR=${D}${bindir}" \ @@ -29,6 +33,11 @@ do_install () { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system + + 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/ + fi } CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.55.bb similarity index 100% rename from meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.55.bb diff --git a/meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/files/dnsmasq.conf b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf similarity index 100% rename from meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/files/dnsmasq.conf rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf diff --git a/meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/files/dnsmasq.service b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.service similarity index 100% rename from meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/files/dnsmasq.service rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.service diff --git a/meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/files/init b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init similarity index 100% rename from meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/files/init rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init diff --git a/meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb b/meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb deleted file mode 100644 index 7d698c6..0000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb +++ /dev/null @@ -1,13 +0,0 @@ -# dnsmasq with support for DBus interface - -require dnsmasq_${PV}.bb - -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/ -} -- 2.7.4