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 /meta-systemd | |
| 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>
Diffstat (limited to 'meta-systemd')
| -rw-r--r-- | meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service | 13 | ||||
| -rw-r--r-- | meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend | 18 |
2 files changed, 0 insertions, 31 deletions
diff --git a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service b/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service deleted file mode 100644 index 549e15e2b2..0000000000 --- a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=DNS forwarder and DHCP server -After=network.target - -[Service] -Type=forking -PIDFile=/run/dnsmasq.pid -ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -ExecReload=/bin/kill -HUP $(/bin/cat /run/dnsmasq.pid) - -[Install] -WantedBy=multi-user.target - 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 -} - |