diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2015-01-12 13:42:16 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:35:28 +0000 |
| commit | c9281266ea3b56a2a44ab5e543ead5cd0f80a42f (patch) | |
| tree | c3f773810c07ace689665be12f2d3be4cef60cf3 /meta/recipes-connectivity/dhcp/dhcp.inc | |
| parent | 580c2398cb6c84d89badc22fd9f5453b74d73a79 (diff) | |
| download | openembedded-core-c9281266ea3b56a2a44ab5e543ead5cd0f80a42f.tar.gz openembedded-core-c9281266ea3b56a2a44ab5e543ead5cd0f80a42f.tar.bz2 openembedded-core-c9281266ea3b56a2a44ab5e543ead5cd0f80a42f.zip | |
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
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp.inc')
| -rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp.inc | 6 |
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 DEPENDS = "openssl bind" SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ - file://site.h \ + file://define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \ file://init-relay file://default-relay \ file://init-server file://default-server \ file://dhclient.conf file://dhcpd.conf \ @@ -36,10 +36,6 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \ --with-libbind=${STAGING_LIBDIR}/ \ " -do_compile_prepend () { - cp -f ${WORKDIR}/site.h ${S}/includes -} - do_install_append () { install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/default |