diff options
author | Randy MacLeod <randy.macleod@windriver.com> | 2018-08-29 20:36:49 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-08-30 09:19:35 -0700 |
commit | 72869dc798fee0c6b3b1e9cc71a40ca989261317 (patch) | |
tree | 1960940b83f1b9eaebd22696bf61a130deab4b7e /meta-oe/recipes-extended/rsyslog | |
parent | c50d90be29692c5dad2166f2d1f103ab116e5ac1 (diff) | |
download | meta-openembedded-72869dc798fee0c6b3b1e9cc71a40ca989261317.tar.gz |
rsyslog: update from 8.36 to 8.37
Drop upstreamed patch:
edce434db fix race in parallel builds
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/rsyslog')
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch | 41 | ||||
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb (renamed from meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb) | 5 |
2 files changed, 2 insertions, 44 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch deleted file mode 100644 index a1efe4d4b..000000000 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 7f003e3a7d4d6dda1cbca1694b62754878c58df0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Fri, 27 Jul 2018 10:19:29 +0800 | ||
4 | Subject: [PATCH] fix race in parallel builds | ||
5 | |||
6 | If libgcry.la is built later than lmcry_gcry.la, there is a failure: | ||
7 | [snip] | ||
8 | |../aarch64-wrs-linux-libtool --tag=CC --mode=link aarch64-wrs-linux-gcc | ||
9 | -o lmcry_gcry.la lmcry_gcry_la-lmcry_gcry.lo libgcry.la -lgcrypt | ||
10 | |aarch64-wrs-linux-libtool: error: cannot find the library 'libgcry.la' | ||
11 | or unhandled argument 'libgcry.la' | ||
12 | |Makefile:1049: recipe for target 'lmcry_gcry.la' failed | ||
13 | |make[2]: *** [lmcry_gcry.la] Error 1 | ||
14 | [snip] | ||
15 | |||
16 | The LIBADD of lmcry_gcry.la contains libgcry.la, we should also add libgcry.la | ||
17 | to lmcry_gcry.la's DEPENDENCIES. | ||
18 | |||
19 | Upstream-Status: Submitted [https://github.com/rsyslog/rsyslog/pull/2882] | ||
20 | |||
21 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
22 | --- | ||
23 | runtime/Makefile.am | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/runtime/Makefile.am b/runtime/Makefile.am | ||
27 | index 56bc08e..5ada0c4 100644 | ||
28 | --- a/runtime/Makefile.am | ||
29 | +++ b/runtime/Makefile.am | ||
30 | @@ -202,7 +202,7 @@ if ENABLE_LIBGCRYPT | ||
31 | libgcry_la_SOURCES = libgcry.c libgcry_common.c libgcry.h | ||
32 | libgcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS) | ||
33 | pkglib_LTLIBRARIES += lmcry_gcry.la | ||
34 | - lmcry_gcry_la_DEPENDENCIES = librsyslog.la | ||
35 | + lmcry_gcry_la_DEPENDENCIES = librsyslog.la libgcry.la | ||
36 | lmcry_gcry_la_SOURCES = lmcry_gcry.c lmcry_gcry.h | ||
37 | lmcry_gcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS) | ||
38 | lmcry_gcry_la_LDFLAGS = -module -avoid-version \ | ||
39 | -- | ||
40 | 2.7.4 | ||
41 | |||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb index 13c1f56ee..fb151428f 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb | |||
@@ -24,15 +24,14 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t | |||
24 | file://use-pkgconfig-to-check-libgcrypt.patch \ | 24 | file://use-pkgconfig-to-check-libgcrypt.patch \ |
25 | file://run-ptest \ | 25 | file://run-ptest \ |
26 | file://rsyslog-fix-ptest-not-finish.patch \ | 26 | file://rsyslog-fix-ptest-not-finish.patch \ |
27 | file://fix-race-in-parallel-builds.patch \ | ||
28 | " | 27 | " |
29 | 28 | ||
30 | SRC_URI_append_libc-musl = " \ | 29 | SRC_URI_append_libc-musl = " \ |
31 | file://0001-Include-sys-time-h.patch \ | 30 | file://0001-Include-sys-time-h.patch \ |
32 | " | 31 | " |
33 | 32 | ||
34 | SRC_URI[md5sum] = "6846bb6d37af3ce067988dd2460d3a5d" | 33 | SRC_URI[md5sum] = "e0942b4b88a13602a6b6352bf9f05091" |
35 | SRC_URI[sha256sum] = "8a4b5beb92c6b308c3d14de2364c2788f62ef5d37ca0448144619edfe508ee70" | 34 | SRC_URI[sha256sum] = "295c289b4c8abd8f8f3fe35a83249b739cedabe82721702b910255f9faf147e7" |
36 | 35 | ||
37 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" | 36 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" |
38 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 37 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |