summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp/dhcp
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
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')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch26
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/site.h21
2 files changed, 26 insertions, 21 deletions
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 @@
1define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF
2
3Upstream-Status: inappropriate <oe specific>
4
5Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
6---
7 includes/site.h | 3 ++-
8 1 file changed, 2 insertions(+), 1 deletion(-)
9
10diff --git a/includes/site.h b/includes/site.h
11index d87b309..17bc40d 100644
12--- a/includes/site.h
13+++ b/includes/site.h
14@@ -139,7 +139,8 @@
15 /* Define this if you want the dhcpd.conf file to go somewhere other than
16 the default location. By default, it goes in /etc/dhcpd.conf. */
17
18-/* #define _PATH_DHCPD_CONF "/etc/dhcpd.conf" */
19+#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
20+#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
21
22 /* Network API definitions. You do not need to choose one of these - if
23 you don't choose, one will be chosen for you in your system's config
24--
251.9.1
26
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 @@
1/*
2 * define config file location in ${S}/includes/site.h
3 * still need to take care of installation path (${sysconfdir}/dhcpd.conf)
4 *
5 * 7/22/2010 - qhe
6 */
7
8/* Define this if you want DNS update functionality to be available. */
9
10#define NSUPDATE
11
12/* Define this if you aren't debugging and you want to save memory
13 (potentially a _lot_ of memory) by allocating leases in chunks rather
14 than one at a time. */
15
16#define COMPACT_LEASES
17
18
19/* local */
20#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
21#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"