From 3948336d8d3f0083222d9607c0b7b97922ef13c6 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 12 Jan 2015 13:42:16 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/dhcp/dhcp.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'meta/recipes-connectivity/dhcp/dhcp.inc') 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 -- cgit v1.2.3-54-g00ecf