helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-30 00:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcp: remove parts now merged into OE-Core recipe

Browse Source 
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2014-09-17 15:24:10 +01:00 committed by Martin Jansa
parent 2b47bf3d60
commit 1956582b91
3 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcpd.service
View File

@ -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

10
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcrelay.service
View File

@ -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

17
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
View File

@ -1,16 +1,10 @@
# look for files in the layer first # look for files in the layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
inherit systemd SYSTEMD_PACKAGES += "dhcp-client"
SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client"
SYSTEMD_SERVICE_dhcp-server = "dhcpd.service"
SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service"
SYSTEMD_SERVICE_dhcp-client = "dhclient.service" SYSTEMD_SERVICE_dhcp-client = "dhclient.service"
SYSTEMD_AUTO_ENABLE_dhcp-client = "disable" 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" FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service"
RPROVIDES_dhcp-server += "dhcp-server-systemd" RPROVIDES_dhcp-server += "dhcp-server-systemd"
RREPLACES_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" RREPLACES_dhcp-client += "dhcp-client-systemd"
RCONFLICTS_dhcp-client += "dhcp-client-systemd" RCONFLICTS_dhcp-client += "dhcp-client-systemd"
SRC_URI += "file://dhcpd.service \ SRC_URI += "file://dhclient.service"
file://dhclient.service \
file://dhcrelay.service \
"
do_install_append() { 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}/dhclient.service ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
} }