summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Jean Texier <pjtexier@koncepto.io>2020-05-03 16:40:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-07 12:15:59 +0100
commita8625d04c783e52c130822d7e92a86f865bceac7 (patch)
treef89a4d2f35ef2bf1fe589531ed2d5ce9add92553
parentecd5eacbdd66a97135e6f57db9065a89828a31f2 (diff)
downloadpoky-a8625d04c783e52c130822d7e92a86f865bceac7.tar.gz
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>
-rw-r--r--meta/recipes-extended/sysklogd/files/0001-fix-one-rarely-reproduced-parallel-build-problem.patch40
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc1
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb3
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb3
4 files changed, 3 insertions, 44 deletions
diff --git a/meta/recipes-extended/sysklogd/files/0001-fix-one-rarely-reproduced-parallel-build-problem.patch b/meta/recipes-extended/sysklogd/files/0001-fix-one-rarely-reproduced-parallel-build-problem.patch
deleted file mode 100644
index 97bf6ae50e..0000000000
--- a/meta/recipes-extended/sysklogd/files/0001-fix-one-rarely-reproduced-parallel-build-problem.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From dcaa75391ff267c38e776d48c579cdb734b91af3 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 23 Mar 2020 15:52:32 +0800
4Subject: [PATCH] fix one rarely reproduced parallel build problem
5
6fix for this issue:
7https://github.com/troglobit/sysklogd/issues/17
8
9Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
10Signed-off-by: Changqing Li <changqing.li@windriver.com>
11
12Upstream-Status: Backport
13[https://github.com/troglobit/sysklogd/commit/b88e21d1770a262f0e5d0f6b84f0abd4a5de55b7]
14
15Signed-off-by: Changqing Li <changqing.li@windriver.com>
16---
17 src/Makefile.am | 10 ++++++++++
18 1 file changed, 10 insertions(+)
19
20diff --git a/src/Makefile.am b/src/Makefile.am
21index 993dbfd..06b706d 100644
22--- a/src/Makefile.am
23+++ b/src/Makefile.am
24@@ -56,3 +56,13 @@ libsyslog_la_SOURCES = syslog.c syslog.h compat.h
25 libsyslog_la_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600
26 libsyslog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
27 libsyslog_la_LIBADD = $(LTLIBOBJS)
28+
29+# Both libsyslog_la and syslogd/logger requires objects like lib/pidfile.o, for
30+# libsyslog_la, the objects should be compiled with -fPIC, but for
31+# syslogd/logger, it doesn't need -fPIC, so there is a race issue when the two
32+# different lib/pidfile.o are compiled at the same time, which would cause errors like:
33+# ld: syslogd-syslogd.o: in function `main':
34+# syslogd.c:417: undefined reference to `__pidfile'
35+#
36+# Make LIBOBJS depend on LTLIBOBJS to fix the problem.
37+$(LIBOBJS): $(LTLIBOBJS)
38--
392.7.4
40
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 8899daa1b0..2e3d9831b1 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -12,7 +12,6 @@ inherit update-rc.d update-alternatives systemd autotools
12 12
13SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ 13SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \
14 file://sysklogd \ 14 file://sysklogd \
15 file://0001-fix-one-rarely-reproduced-parallel-build-problem.patch \
16 " 15 "
17S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
18 17
diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb b/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb
deleted file mode 100644
index eb6b4effae..0000000000
--- a/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1require sysklogd.inc
2
3SRCREV = "24dafe9a27ac959ebeb89acd3ebd3d62cca4b755"
diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb b/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb
new file mode 100644
index 0000000000..2917c2aae0
--- /dev/null
+++ b/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb
@@ -0,0 +1,3 @@
1require sysklogd.inc
2
3SRCREV = "6d6010add698370fc7d9828f0aaa18613dd2397f"