sysklogd: upgrade 2.1.1 -> 2.1.2

See https://github.com/troglobit/sysklogd/releases/tag/v2.1.2

Also remove patch applied upstream.

(From OE-Core rev: 7b8c52c76b41cb83452338ba5ede66e74c8956d5)

Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Pierre-Jean Texier
2020-05-03 16:40:41 +02:00
committed by Richard Purdie
parent ecd5eacbdd
commit a8625d04c7
4 changed files with 3 additions and 44 deletions

View File

@@ -1,40 +0,0 @@
From dcaa75391ff267c38e776d48c579cdb734b91af3 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 23 Mar 2020 15:52:32 +0800
Subject: [PATCH] fix one rarely reproduced parallel build problem
fix for this issue:
https://github.com/troglobit/sysklogd/issues/17
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Upstream-Status: Backport
[https://github.com/troglobit/sysklogd/commit/b88e21d1770a262f0e5d0f6b84f0abd4a5de55b7]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
src/Makefile.am | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/Makefile.am b/src/Makefile.am
index 993dbfd..06b706d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,3 +56,13 @@ libsyslog_la_SOURCES = syslog.c syslog.h compat.h
libsyslog_la_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600
libsyslog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
libsyslog_la_LIBADD = $(LTLIBOBJS)
+
+# Both libsyslog_la and syslogd/logger requires objects like lib/pidfile.o, for
+# libsyslog_la, the objects should be compiled with -fPIC, but for
+# syslogd/logger, it doesn't need -fPIC, so there is a race issue when the two
+# different lib/pidfile.o are compiled at the same time, which would cause errors like:
+# ld: syslogd-syslogd.o: in function `main':
+# syslogd.c:417: undefined reference to `__pidfile'
+#
+# Make LIBOBJS depend on LTLIBOBJS to fix the problem.
+$(LIBOBJS): $(LTLIBOBJS)
--
2.7.4

View File

@@ -12,7 +12,6 @@ inherit update-rc.d update-alternatives systemd autotools
SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \
file://sysklogd \
file://0001-fix-one-rarely-reproduced-parallel-build-problem.patch \
"
S = "${WORKDIR}/git"

View File

@@ -1,3 +0,0 @@
require sysklogd.inc
SRCREV = "24dafe9a27ac959ebeb89acd3ebd3d62cca4b755"

View File

@@ -0,0 +1,3 @@
require sysklogd.inc
SRCREV = "6d6010add698370fc7d9828f0aaa18613dd2397f"