diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 14:01:14 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:03 +0200 |
commit | 443ea30263cf4a6382ff7c647130bbe7604f6296 (patch) | |
tree | 8bb0f574772d75a3d54f996f857c3d43d4714f0a | |
parent | eb0e685982643787b5c4787a2640a1b92102b35e (diff) | |
download | meta-openembedded-contrib-443ea30263cf4a6382ff7c647130bbe7604f6296.tar.gz |
dnsmasq: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc | 14 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/dnsmasq/files/dnsmasq.service (renamed from meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service) | 0 | ||||
-rw-r--r-- | meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend | 18 |
4 files changed, 14 insertions, 20 deletions
diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc index d6f3a54c32..ef99f489c0 100644 --- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc +++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc @@ -9,9 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ #at least versions 2.15 and prior are moved to the archive folder on the server SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV',1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \ file://init \ - file://dnsmasq.conf" + file://dnsmasq.conf \ + file://dnsmasq.service \ +" -inherit update-rc.d +inherit update-rc.d systemd INITSCRIPT_NAME = "dnsmasq" INITSCRIPT_PARAMS = "defaults" @@ -24,6 +26,14 @@ do_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 + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system } CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "dnsmasq.service" diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb index 5f877047f7..ae37db7391 100644 --- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb +++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb @@ -1,4 +1,6 @@ require dnsmasq.inc +PR = "r3" + SRC_URI[dnsmasq-2.55.md5sum] = "b093d7c6bc7f97ae6fd35d048529232a" SRC_URI[dnsmasq-2.55.sha256sum] = "cf63ecf5977f00474cbda98376a9d8743500a82fd98e13f43d7037bce9f9f929" diff --git a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service b/meta-oe/recipes-connectivity/dnsmasq/files/dnsmasq.service index 549e15e2b2..549e15e2b2 100644 --- a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service +++ b/meta-oe/recipes-connectivity/dnsmasq/files/dnsmasq.service diff --git a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend b/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend deleted file mode 100644 index 148586e2c1..0000000000 --- a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 2}" - -inherit systemd - -SRC_URI += "file://dnsmasq.service" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "dnsmasq.service" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system -} - |