summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp/dhcp.inc
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2015-01-12 13:42:16 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:30 +0000
commit3948336d8d3f0083222d9607c0b7b97922ef13c6 (patch)
tree31bd2bed4b9799491b22711570a4e97786d2df9a /meta/recipes-connectivity/dhcp/dhcp.inc
parentbee37d495d4fca352e832b65fb9d69f17abf944c (diff)
downloadpoky-3948336d8d3f0083222d9607c0b7b97922ef13c6.tar.gz
dhcp: not override site.h
Previously, site.h was overridden for setting _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF, it caused other MACROs were missing, so we use a patch to instead. The macros NSUPDATE and COMPACT_LEASES existed in site.h (From OE-Core rev: c9281266ea3b56a2a44ab5e543ead5cd0f80a42f) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp.inc')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc6
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index 4949e0201e..6ced77500a 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1
13DEPENDS = "openssl bind" 13DEPENDS = "openssl bind"
14 14
15SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ 15SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
16 file://site.h \ 16 file://define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \
17 file://init-relay file://default-relay \ 17 file://init-relay file://default-relay \
18 file://init-server file://default-server \ 18 file://init-server file://default-server \
19 file://dhclient.conf file://dhcpd.conf \ 19 file://dhclient.conf file://dhcpd.conf \
@@ -36,10 +36,6 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
36 --with-libbind=${STAGING_LIBDIR}/ \ 36 --with-libbind=${STAGING_LIBDIR}/ \
37 " 37 "
38 38
39do_compile_prepend () {
40 cp -f ${WORKDIR}/site.h ${S}/includes
41}
42
43do_install_append () { 39do_install_append () {
44 install -d ${D}${sysconfdir}/init.d 40 install -d ${D}${sysconfdir}/init.d
45 install -d ${D}${sysconfdir}/default 41 install -d ${D}${sysconfdir}/default