diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-05-20 19:24:11 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-05-20 19:24:36 +0300 |
commit | 393846f19370b4407e24b907dbb48b1b16d78fcd (patch) | |
tree | f5810f62cbf574a301ac11f7338815008ed744aa /poky/meta/recipes-connectivity/dhcp | |
parent | d851626f8b40842d5d8ba1cd30e74ab472ab3d2e (diff) | |
download | openbmc-393846f19370b4407e24b907dbb48b1b16d78fcd.tar.xz |
poky: subtree update:a015ed7704..797916f93a
Adrian Bunk (4):
poky-tiny.conf: Remove the removed irda feature from a comment
musl: Add TEMP_FAILURE_RETRY from glibc
systemd: Disable idn properly for musl instead of NI_IDN workarounds
ofono: upgrade 1.25 -> 1.29
Alexander Kanavin (2):
packagegroup-cross-canadian: repackage when TUNE_ARCH changes
qemux86: use a Core 2 Duo CPU instead of the original circa-1993 Pentium
Fabio Berton (1):
mesa: Convert recipe to use meson build system
Haiqing Bai (1):
sysstat: Add PACKAGECONFIG[cron] for '--enable-install-cron' option
Khem Raj (2):
mmc-utils: Fix build with clang
epiphany: Do not bypass initialization of variable with __attribute__((cleanup))
Liwei Song (1):
mdadm: install the systemd service through Makefile
Marco Felsch (1):
mesa: fix imx gallium driver PACKAGECONFIG option
Mark Hatle (1):
bitbake: gitsm: Fix a bug where the wrong path was used for the submodule init
Martin Jansa (2):
grub-efi-cfg, systemd-boot-cfg: use MACHINE_ARCH
tcmode-default.inc: use the same TUNE_PKGARCH variable as PN set in go-cross
Ming Liu (2):
kernel.bbclass: adjust a condition checking
dhcp: fix a NSUPDATE compiling issue
Richard Purdie (2):
gettext/flex/m4/bzip2/gzip/parted/slang/attr: Add make to -ptest packages
apr/apr-util: Add ptest dependency on libgcc
Ross Burton (1):
glib-2.0: add missing libgcc dependency to glib-2.0-ptest
Tim Orling (1):
libtest-needs-perl: upgrade 0.002005 -> 0.002006
Zang Ruochen (1):
libinput: Upgrade 1.13.1 -> 1.13.2
Change-Id: Ic565210b5ca776c937445934910f602f424ecce1
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-connectivity/dhcp')
-rw-r--r-- | poky/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch | 68 | ||||
-rw-r--r-- | poky/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb | 1 |
2 files changed, 69 insertions, 0 deletions
diff --git a/poky/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch new file mode 100644 index 000000000..f12a112fc --- /dev/null +++ b/poky/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch @@ -0,0 +1,68 @@ +From a59cb98a473caa2afd64d7ae368480b6e9f91b3f Mon Sep 17 00:00:00 2001 +From: Ming Liu <liu.ming50@gmail.com> +Date: Tue, 14 May 2019 11:07:15 +0200 +Subject: [PATCH] Fix a NSUPDATE compiling issue + +Upstream-Status: Pending [Patch sent to: https://gitlab.isc.org/isc-projects/dhcp/issues/16] + +A following error was observed when NSUPDATE is not defined: +| 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 + +Fix it by adding NSUPDATE conditional checking. + +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + includes/omapip/isclib.h | 2 ++ + omapip/isclib.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h +index 538b927..6c20584 100644 +--- a/includes/omapip/isclib.h ++++ b/includes/omapip/isclib.h +@@ -141,6 +141,8 @@ void isclib_cleanup(void); + void dhcp_signal_handler(int signal); + extern int shutdown_signal; + ++#if defined (NSUPDATE) + isc_result_t dns_client_init(); ++#endif + + #endif /* ISCLIB_H */ +diff --git a/omapip/isclib.c b/omapip/isclib.c +index db3b895..ce4b4a1 100644 +--- a/omapip/isclib.c ++++ b/omapip/isclib.c +@@ -351,6 +351,7 @@ void dhcp_signal_handler(int signal) { + } + } + ++#if defined (NSUPDATE) + isc_result_t dns_client_init() { + isc_result_t result; + if (dhcp_gbl_ctx.dnsclient == NULL) { +@@ -387,3 +388,4 @@ isc_result_t dns_client_init() { + + return ISC_R_SUCCESS; + } ++#endif +-- +2.7.4 + diff --git a/poky/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb b/poky/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb index e8cc731a2..19524cb3c 100644 --- a/poky/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb +++ b/poky/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 file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \ file://0013-fixup_use_libbind.patch \ file://0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch \ + file://0001-Fix-a-NSUPDATE-compiling-issue.patch \ " SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede" |