summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc6
-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
3 files changed, 27 insertions, 26 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
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"