[oe-commits] Otavio Salvador : dhcp: move server configuration to dhcp-server-config
git at git.openembedded.org
git at git.openembedded.org
Tue Nov 8 21:45:07 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: ca183f84c2f3e132059e2f63d7ed8ca27987a99e
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ca183f84c2f3e132059e2f63d7ed8ca27987a99e
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Fri Nov 4 18:18:21 2011 +0000
dhcp: move server configuration to dhcp-server-config
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
meta/recipes-connectivity/dhcp/dhcp.inc | 10 ++++++++--
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 \
More information about the Openembedded-commits
mailing list