summaryrefslogtreecommitdiffstats
path: root/meta-systemd/meta-oe
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 14:01:14 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:22:03 +0200
commit443ea30263cf4a6382ff7c647130bbe7604f6296 (patch)
tree8bb0f574772d75a3d54f996f857c3d43d4714f0a /meta-systemd/meta-oe
parenteb0e685982643787b5c4787a2640a1b92102b35e (diff)
downloadmeta-openembedded-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/meta-oe')
-rw-r--r--meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service13
-rw-r--r--meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend18
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 549e15e2b..000000000
--- a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service
+++ /dev/null
@@ -1,13 +0,0 @@
1[Unit]
2Description=DNS forwarder and DHCP server
3After=network.target
4
5[Service]
6Type=forking
7PIDFile=/run/dnsmasq.pid
8ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid
9ExecReload=/bin/kill -HUP $(/bin/cat /run/dnsmasq.pid)
10
11[Install]
12WantedBy=multi-user.target
13
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 148586e2c..000000000
--- a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3PRINC := "${@int(PRINC) + 2}"
4
5inherit systemd
6
7SRC_URI += "file://dnsmasq.service"
8
9RPROVIDES_${PN} += "${PN}-systemd"
10RREPLACES_${PN} += "${PN}-systemd"
11RCONFLICTS_${PN} += "${PN}-systemd"
12SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
13
14do_install_append() {
15 install -d ${D}${systemd_unitdir}/system
16 install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
17}
18