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 --- ...o-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch | 26 ++++++++++++++++++++++ meta/recipes-connectivity/dhcp/dhcp/site.h | 21 ----------------- 2 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/site.h (limited to 'meta/recipes-connectivity/dhcp/dhcp') diff --git a/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch b/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch new file mode 100644 index 0000000000..12d3c9bdbd --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch @@ -0,0 +1,26 @@ +define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF + +Upstream-Status: inappropriate + +Signed-off-by: Hongxu Jia +--- + includes/site.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/includes/site.h b/includes/site.h +index d87b309..17bc40d 100644 +--- a/includes/site.h ++++ b/includes/site.h +@@ -139,7 +139,8 @@ + /* Define this if you want the dhcpd.conf file to go somewhere other than + the default location. By default, it goes in /etc/dhcpd.conf. */ + +-/* #define _PATH_DHCPD_CONF "/etc/dhcpd.conf" */ ++#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" ++#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" + + /* Network API definitions. You do not need to choose one of these - if + you don't choose, one will be chosen for you in your system's config +-- +1.9.1 + diff --git a/meta/recipes-connectivity/dhcp/dhcp/site.h b/meta/recipes-connectivity/dhcp/dhcp/site.h deleted file mode 100644 index 2289554ef3..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/site.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * define config file location in ${S}/includes/site.h - * still need to take care of installation path (${sysconfdir}/dhcpd.conf) - * - * 7/22/2010 - qhe - */ - -/* Define this if you want DNS update functionality to be available. */ - -#define NSUPDATE - -/* Define this if you aren't debugging and you want to save memory - (potentially a _lot_ of memory) by allocating leases in chunks rather - than one at a time. */ - -#define COMPACT_LEASES - - -/* local */ -#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" -#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" -- cgit v1.2.3-54-g00ecf