All of lore.kernel.org
 help / color / mirror / Atom feed
From: Randy MacLeod <Randy.MacLeod@windriver.com>
To: <openembedded-devel@lists.openembedded.org>
Subject: [meta-oe][PATCH] rsyslog: update from 8.36 to 8.37
Date: Wed, 29 Aug 2018 20:36:49 -0700	[thread overview]
Message-ID: <20180830033649.60425-1-Randy.MacLeod@windriver.com> (raw)

Drop upstreamed patch:
   edce434db fix race in parallel builds

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
 .../rsyslog/fix-race-in-parallel-builds.patch | 41 -------------------
 .../{rsyslog_8.36.0.bb => rsyslog_8.37.0.bb}  |  5 +--
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch
 rename meta-oe/recipes-extended/rsyslog/{rsyslog_8.36.0.bb => rsyslog_8.37.0.bb} (97%)

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 @@
-From 7f003e3a7d4d6dda1cbca1694b62754878c58df0 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Fri, 27 Jul 2018 10:19:29 +0800
-Subject: [PATCH] fix race in parallel builds
-
-If libgcry.la is built later than lmcry_gcry.la, there is a failure:
-[snip]
-|../aarch64-wrs-linux-libtool  --tag=CC   --mode=link aarch64-wrs-linux-gcc
--o lmcry_gcry.la lmcry_gcry_la-lmcry_gcry.lo libgcry.la -lgcrypt
-|aarch64-wrs-linux-libtool:   error: cannot find the library 'libgcry.la'
-or unhandled argument 'libgcry.la'
-|Makefile:1049: recipe for target 'lmcry_gcry.la' failed
-|make[2]: *** [lmcry_gcry.la] Error 1
-[snip]
-
-The LIBADD of lmcry_gcry.la contains libgcry.la, we should also add libgcry.la
-to lmcry_gcry.la's DEPENDENCIES.
-
-Upstream-Status: Submitted [https://github.com/rsyslog/rsyslog/pull/2882]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- runtime/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/runtime/Makefile.am b/runtime/Makefile.am
-index 56bc08e..5ada0c4 100644
---- a/runtime/Makefile.am
-+++ b/runtime/Makefile.am
-@@ -202,7 +202,7 @@ if ENABLE_LIBGCRYPT
-    libgcry_la_SOURCES = libgcry.c libgcry_common.c libgcry.h
-    libgcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS)
-    pkglib_LTLIBRARIES += lmcry_gcry.la
--   lmcry_gcry_la_DEPENDENCIES = librsyslog.la
-+   lmcry_gcry_la_DEPENDENCIES = librsyslog.la libgcry.la
-    lmcry_gcry_la_SOURCES = lmcry_gcry.c lmcry_gcry.h
-    lmcry_gcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS)
-    lmcry_gcry_la_LDFLAGS = -module -avoid-version \
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb
similarity index 97%
rename from meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb
rename to 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
            file://use-pkgconfig-to-check-libgcrypt.patch \
            file://run-ptest \
            file://rsyslog-fix-ptest-not-finish.patch \
-           file://fix-race-in-parallel-builds.patch \
 "
 
 SRC_URI_append_libc-musl = " \
     file://0001-Include-sys-time-h.patch \
 "
 
-SRC_URI[md5sum] = "6846bb6d37af3ce067988dd2460d3a5d"
-SRC_URI[sha256sum] = "8a4b5beb92c6b308c3d14de2364c2788f62ef5d37ca0448144619edfe508ee70"
+SRC_URI[md5sum] = "e0942b4b88a13602a6b6352bf9f05091"
+SRC_URI[sha256sum] = "295c289b4c8abd8f8f3fe35a83249b739cedabe82721702b910255f9faf147e7"
 
 UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
-- 
2.17.1



                 reply	other threads:[~2018-08-30  3:36 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180830033649.60425-1-Randy.MacLeod@windriver.com \
    --to=randy.macleod@windriver.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.