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 /poky/meta/recipes-support/apr | |
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 'poky/meta/recipes-support/apr')
-rw-r--r-- | poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch | 32 | ||||
-rw-r--r-- | poky/meta/recipes-support/apr/apr_1.6.3.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch b/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch new file mode 100644 index 000000000..6809fa60b --- /dev/null +++ b/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch @@ -0,0 +1,32 @@ +From 036f90748247417dbfa714b1b912ca7dd4053f04 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 23 Jul 2018 14:12:35 +0800 +Subject: [PATCH] apr: fix ptest hang in teststr + +ptest hang in teststr since turns into a non-terminating loop, +fix by below backported patch. + +Upstream-Status: Backport[https://github.com/apache/apr/commit/ + 2e8fbff4ecf82d0decf6baf774c209948f2f4998?diff=unified] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + test/teststr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/teststr.c b/test/teststr.c +index d9a5054..951a830 100644 +--- a/test/teststr.c ++++ b/test/teststr.c +@@ -307,7 +307,7 @@ static void overflow_strfsize(abts_case *tc, void *data) + for (; off < 999999999; off += 999) { + apr_strfsize(off, buf); + } +- for (off = 1; off < LONG_MAX && off > 0; off *= 2) { ++ for (off = LONG_MAX; off > 1; off /= 2) { + apr_strfsize(off, buf); + apr_strfsize(off + 1, buf); + apr_strfsize(off - 1, buf); +-- +2.7.4 + diff --git a/poky/meta/recipes-support/apr/apr_1.6.3.bb b/poky/meta/recipes-support/apr/apr_1.6.3.bb index 7563a381d..7bfb69855 100644 --- a/poky/meta/recipes-support/apr/apr_1.6.3.bb +++ b/poky/meta/recipes-support/apr/apr_1.6.3.bb @@ -18,6 +18,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ + file://0008-apr-fix-ptest-hang-in-teststr.patch \ " SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa" |