[oe-commits] Paul Eggleton : dhcp: remove parts now merged into OE-Core recipe

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 1956582b91afda4612f0e4c84ab59826a3e1a2c1
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=1956582b91afda4612f0e4c84ab59826a3e1a2c1

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Wed Sep 17 15:24:10 2014 +0100

dhcp: remove parts now merged into OE-Core recipe

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 .../recipes-connectivity/dhcp/dhcp/dhcpd.service        | 12 ------------
 .../recipes-connectivity/dhcp/dhcp/dhcrelay.service     | 10 ----------
 .../oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend   | 17 +++--------------
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcpd.service b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcpd.service
deleted file mode 100644
index 70beee9..0000000
--- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Dynamic Host Configuration Protocol (DHCP)
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/dhcpd.pid
-EnvironmentFile=-/etc/default/dhcp-server
-ExecStart=/usr/sbin/dhcpd -cf /etc/dhcp/dhcpd.conf -q $INTERFACES
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcrelay.service b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcrelay.service
deleted file mode 100644
index f68f468..0000000
--- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcrelay.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=DHCP Relay Agent Daemon
-After=syslog.target network.target
-
-[Service]
-EnvironmentFile=/etc/default/dhcp-relay
-ExecStart=/usr/sbin/dhcrelay -d $DHCRELAYARGS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
index 1dd6d58..6c0fd02 100644
--- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
@@ -1,16 +1,10 @@
 # look for files in the layer first
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-inherit systemd
-
-SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client"
-SYSTEMD_SERVICE_dhcp-server = "dhcpd.service"
-SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service"
+SYSTEMD_PACKAGES += "dhcp-client"
 SYSTEMD_SERVICE_dhcp-client = "dhclient.service"
 SYSTEMD_AUTO_ENABLE_dhcp-client = "disable"
 
-FILES_dhcp-server += "${systemd_unitdir}/system/dhcpd.service"
-FILES_dhcp-relay += "${systemd_unitdir}/system/dhrelay.service"
 FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service"
 RPROVIDES_dhcp-server += "dhcp-server-systemd"
 RREPLACES_dhcp-server += "dhcp-server-systemd"
@@ -22,14 +16,9 @@ RPROVIDES_dhcp-client += "dhcp-client-systemd"
 RREPLACES_dhcp-client += "dhcp-client-systemd"
 RCONFLICTS_dhcp-client += "dhcp-client-systemd"
 
-SRC_URI += "file://dhcpd.service \
-            file://dhclient.service \
-            file://dhcrelay.service \
-"
+SRC_URI += "file://dhclient.service"
+
 do_install_append() {
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
 }