diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2011-11-04 18:18:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-08 21:44:37 +0000 |
| commit | 6dfac91c865854b5fb5d07c5284bfb6f3a50e92e (patch) | |
| tree | fcce1fde8e90d4dc1e6151cb1269bae9a155b013 | |
| parent | 27d84fad1904447820a7ec8e499b69dc48a6f46e (diff) | |
| download | ast2050-yocto-poky-6dfac91c865854b5fb5d07c5284bfb6f3a50e92e.zip ast2050-yocto-poky-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>
| -rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp.inc | 10 | ||||
| -rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc index bdaa5e9..1cc529d 100644 --- a/meta/recipes-connectivity/dhcp/dhcp.inc +++ b/meta/recipes-connectivity/dhcp/dhcp.inc @@ -53,9 +53,15 @@ do_install_append () { install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script } -PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell" +PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell" + FILES_${PN} = "" -FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" + +FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" +RRECOMMENDS_dhcp-server = "dhcp-server-config" + +FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" + FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" FILES_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 223522f..8ed7d76 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 @@ require dhcp.inc -PR = "r2" +PR = "r3" SRC_URI += "file://fixincludes.patch \ file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ |
