From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 25 May 2009 23:39:30 +0000 (+0100)
Subject: dhcp: 3.0.2 -> 4.1.0
X-Git-Tag: 2011-1~7410
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5adadc366bde8039eb445751586f755ad8aa6212;p=openembedded-core.git

dhcp: 3.0.2 -> 4.1.0

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/meta/packages/dhcp/dhcp_3.0.2.bb b/meta/packages/dhcp/dhcp_4.1.0.bb
similarity index 90%
rename from meta/packages/dhcp/dhcp_3.0.2.bb
rename to meta/packages/dhcp/dhcp_4.1.0.bb
index 7fe97ed155..4160575ac2 100644
--- a/meta/packages/dhcp/dhcp_3.0.2.bb
+++ b/meta/packages/dhcp/dhcp_4.1.0.bb
@@ -2,9 +2,8 @@ SECTION = "console/network"
 DESCRIPTION = "Internet Software Consortium DHCP package"
 HOMEPAGE = "http://www.isc.org/"
 LICENSE = "BSD"
-PR = "r4"
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
-	   file://noattrmode.patch;patch=1 \
+PR = "r5"
+SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
 	   file://fixincludes.patch;patch=1 \
 	   file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \
 	   file://init-relay file://default-relay \
@@ -34,6 +33,9 @@ do_install() {
 	install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server
 	install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf
 	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
+	install -d ${D}${base_sbindir}/
+	mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
+	install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
 }
 
 PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell"