summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-11-04 18:18:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-08 21:44:37 +0000
commit6dfac91c865854b5fb5d07c5284bfb6f3a50e92e (patch)
treefcce1fde8e90d4dc1e6151cb1269bae9a155b013 /meta/recipes-connectivity/dhcp
parent27d84fad1904447820a7ec8e499b69dc48a6f46e (diff)
downloadpoky-6dfac91c865854b5fb5d07c5284bfb6f3a50e92e.tar.gz
dhcp: move server configuration to dhcp-server-config
(From OE-Core rev: ca183f84c2f3e132059e2f63d7ed8ca27987a99e) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc10
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb2
2 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index bdaa5e9b00..1cc529dd8d 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -53,9 +53,15 @@ do_install_append () {
53 install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script 53 install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
54} 54}
55 55
56PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell" 56PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
57
57FILES_${PN} = "" 58FILES_${PN} = ""
58FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" 59
60FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
61RRECOMMENDS_dhcp-server = "dhcp-server-config"
62
63FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
64
59FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" 65FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
60 66
61FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf" 67FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index 223522f771..8ed7d76129 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
@@ -1,6 +1,6 @@
1require dhcp.inc 1require dhcp.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5SRC_URI += "file://fixincludes.patch \ 5SRC_URI += "file://fixincludes.patch \
6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ 6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \