diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch new file mode 100644 index 000000000..68b686346 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch @@ -0,0 +1,71 @@ +From 3e5a0cb440c788e2383e40ab23ac1cf01d96961b Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Tue, 24 Jul 2018 01:30:25 -0700 +Subject: [PATCH] src/tcp.c: fix jump-misses-init error + +Fix below jump-misses-init error + +| In file included from ../../git/src/tcp.c:51: +| ../../git/src/tcp.c: In function 'relpTcpConnect': +| ../../git/src/relp.h:220:3: error: jump skips variable initialization [-Werror=jump-misses-init] +| goto finalize_it; \ +| ^~~~ +| ../../git/src/tcp.c:1951:3: note: in expansion of macro 'ABORT_FINALIZE' +| ABORT_FINALIZE(RELP_RET_IO_ERR); +| ^~~~~~~~~~~~~~ +| ../../git/src/tcp.c:2005:1: note: label 'finalize_it' defined here +| finalize_it: +| ^~~~~~~~~~~ +| ../../git/src/tcp.c:1991:6: note: 'r' declared here +| int r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, &so_error, &len); +| ^ +| In file included from ../../git/src/tcp.c:51: +| ../../git/src/relp.h:220:3: error: jump skips variable initialization [-Werror=jump-misses-init] +| goto finalize_it; \ +| ^~~~ +| ../../git/src/tcp.c:1951:3: note: in expansion of macro 'ABORT_FINALIZE' +| ABORT_FINALIZE(RELP_RET_IO_ERR); +| ^~~~~~~~~~~~~~ +| ../../git/src/tcp.c:2005:1: note: label 'finalize_it' defined here +| finalize_it: +| ^~~~~~~~~~~ +| ../../git/src/tcp.c:1989:12: note: 'len' declared here +| socklen_t len = sizeof so_error; +| ^~~ + +Upstream-Status: Submitted[https://github.com/rsyslog/librelp/pull/117] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/tcp.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/tcp.c b/src/tcp.c +index f35eb84..fb34dc7 100644 +--- a/src/tcp.c ++++ b/src/tcp.c +@@ -1936,6 +1936,9 @@ relpTcpConnect(relpTcp_t *const pThis, + struct addrinfo hints; + struct addrinfo *reslocal = NULL; + struct pollfd pfd; ++ int so_error; ++ socklen_t len = sizeof so_error; ++ int r; + + ENTER_RELPFUNC; + RELPOBJ_assert(pThis, Tcp); +@@ -1985,10 +1988,8 @@ relpTcpConnect(relpTcp_t *const pThis, + ABORT_FINALIZE(RELP_RET_TIMED_OUT); + } + +- int so_error; +- socklen_t len = sizeof so_error; + +- int r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, &so_error, &len); ++ r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, &so_error, &len); + if (r == -1 || so_error != 0) { + pThis->pEngine->dbgprint("socket has an error %d\n", so_error); + ABORT_FINALIZE(RELP_RET_IO_ERR); +-- +2.17.1 + |