summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2019-05-14 20:32:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-16 09:16:50 +0100
commitf09027011882eb35e2da8e499017d0fdf77d4cd9 (patch)
tree66d592f9b6b40b56720a4ff5b6516d5da5c27719 /meta
parentea8755459fc7ea6dfaaea4a32a790ae7e80776ca (diff)
downloadpoky-f09027011882eb35e2da8e499017d0fdf77d4cd9.tar.gz
dhcp: fix a NSUPDATE compiling issue
This patch fixes a following issue: | omapip/isclib.c: In function 'dns_client_init': | omapip/isclib.c:356:18: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' | if (dhcp_gbl_ctx.dnsclient == NULL) { | ^ | omapip/isclib.c:363:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' | &dhcp_gbl_ctx.dnsclient, | ^ | omapip/isclib.c:364:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local4' | (dhcp_gbl_ctx.use_local4 ? | ^ | omapip/isclib.c:365:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local4_sockaddr' | &dhcp_gbl_ctx.local4_sockaddr | ^ | omapip/isclib.c:367:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local6' | (dhcp_gbl_ctx.use_local6 ? | ^ | omapip/isclib.c:368:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local6_sockaddr' | &dhcp_gbl_ctx.local6_sockaddr (From OE-Core rev: e36076b6feca481b7a7a44b1c03c4cfca2dd8c48) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch68
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb1
2 files changed, 69 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch
new file mode 100644
index 0000000000..f12a112fcf
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch
@@ -0,0 +1,68 @@
1From a59cb98a473caa2afd64d7ae368480b6e9f91b3f Mon Sep 17 00:00:00 2001
2From: Ming Liu <liu.ming50@gmail.com>
3Date: Tue, 14 May 2019 11:07:15 +0200
4Subject: [PATCH] Fix a NSUPDATE compiling issue
5
6Upstream-Status: Pending [Patch sent to: https://gitlab.isc.org/isc-projects/dhcp/issues/16]
7
8A following error was observed when NSUPDATE is not defined:
9| omapip/isclib.c: In function 'dns_client_init':
10| omapip/isclib.c:356:18: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient'
11| if (dhcp_gbl_ctx.dnsclient == NULL) {
12| ^
13| omapip/isclib.c:363:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient'
14| &dhcp_gbl_ctx.dnsclient,
15| ^
16| omapip/isclib.c:364:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local4'
17| (dhcp_gbl_ctx.use_local4 ?
18| ^
19| omapip/isclib.c:365:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local4_sockaddr'
20| &dhcp_gbl_ctx.local4_sockaddr
21| ^
22| omapip/isclib.c:367:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local6'
23| (dhcp_gbl_ctx.use_local6 ?
24| ^
25| omapip/isclib.c:368:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local6_sockaddr'
26| &dhcp_gbl_ctx.local6_sockaddr
27
28Fix it by adding NSUPDATE conditional checking.
29
30Signed-off-by: Ming Liu <liu.ming50@gmail.com>
31---
32 includes/omapip/isclib.h | 2 ++
33 omapip/isclib.c | 2 ++
34 2 files changed, 4 insertions(+)
35
36diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
37index 538b927..6c20584 100644
38--- a/includes/omapip/isclib.h
39+++ b/includes/omapip/isclib.h
40@@ -141,6 +141,8 @@ void isclib_cleanup(void);
41 void dhcp_signal_handler(int signal);
42 extern int shutdown_signal;
43
44+#if defined (NSUPDATE)
45 isc_result_t dns_client_init();
46+#endif
47
48 #endif /* ISCLIB_H */
49diff --git a/omapip/isclib.c b/omapip/isclib.c
50index db3b895..ce4b4a1 100644
51--- a/omapip/isclib.c
52+++ b/omapip/isclib.c
53@@ -351,6 +351,7 @@ void dhcp_signal_handler(int signal) {
54 }
55 }
56
57+#if defined (NSUPDATE)
58 isc_result_t dns_client_init() {
59 isc_result_t result;
60 if (dhcp_gbl_ctx.dnsclient == NULL) {
61@@ -387,3 +388,4 @@ isc_result_t dns_client_init() {
62
63 return ISC_R_SUCCESS;
64 }
65+#endif
66--
672.7.4
68
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb
index e8cc731a26..19524cb3c9 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb
@@ -11,6 +11,7 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat
11 file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \ 11 file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \
12 file://0013-fixup_use_libbind.patch \ 12 file://0013-fixup_use_libbind.patch \
13 file://0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch \ 13 file://0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch \
14 file://0001-Fix-a-NSUPDATE-compiling-issue.patch \
14" 15"
15 16
16SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede" 17SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede"