From 443ea30263cf4a6382ff7c647130bbe7604f6296 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 13 Apr 2013 14:01:14 +0200 Subject: dnsmasq: move systemd support from meta-systemd back to meta-oe Signed-off-by: Martin Jansa --- .../dnsmasq/dnsmasq/dnsmasq.service | 13 ------------- .../recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend | 18 ------------------ 2 files changed, 31 deletions(-) delete mode 100644 meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service delete mode 100644 meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend (limited to 'meta-systemd') 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 -} - -- cgit v1.2.3-54-g00ecf