diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-02-06 06:53:22 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-08 13:20:02 +0000 |
commit | cc7164836097a4100dce65e93b24a3a8874f65b3 (patch) | |
tree | 9c142562ffd15a09e3e6cb2876032268be171e19 /meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch | |
parent | d16884504627477496a39043e658ce0ebb69f830 (diff) | |
download | poky-cc7164836097a4100dce65e93b24a3a8874f65b3.tar.gz |
dhcp: upgrade 4.4.1 -> 4.4.2
0001-Fix-a-NSUPDATE-compiling-issue.patch
0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch
Removed since they are included in 4.4.2.
refresh the following patch:
0004-Fix-out-of-tree-builds.patch
(From OE-Core rev: d3c6f7e689a743fd060755eceb60353093013e84)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch | 68 |
1 files changed, 0 insertions, 68 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 deleted file mode 100644 index f12a112fcf..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From a59cb98a473caa2afd64d7ae368480b6e9f91b3f Mon Sep 17 00:00:00 2001 | ||
2 | From: Ming Liu <liu.ming50@gmail.com> | ||
3 | Date: Tue, 14 May 2019 11:07:15 +0200 | ||
4 | Subject: [PATCH] Fix a NSUPDATE compiling issue | ||
5 | |||
6 | Upstream-Status: Pending [Patch sent to: https://gitlab.isc.org/isc-projects/dhcp/issues/16] | ||
7 | |||
8 | A 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 | |||
28 | Fix it by adding NSUPDATE conditional checking. | ||
29 | |||
30 | Signed-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 | |||
36 | diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h | ||
37 | index 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 */ | ||
49 | diff --git a/omapip/isclib.c b/omapip/isclib.c | ||
50 | index 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 | -- | ||
67 | 2.7.4 | ||
68 | |||