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:11:03 +0100
commit7b8c52c76b41cb83452338ba5ede66e74c8956d5 (patch)
tree44305f4e6d4eb28740de8243e984cb11cb632c55
parent3fdd772b419bbecb1fac1efae874a8f160f2112d (diff)
downloadopenembedded-core-contrib-7b8c52c76b41cb83452338ba5ede66e74c8956d5.tar.gz
openembedded-core-contrib-7b8c52c76b41cb83452338ba5ede66e74c8956d5.tar.bz2
openembedded-core-contrib-7b8c52c76b41cb83452338ba5ede66e74c8956d5.zip
sysklogd: upgrade 2.1.1 -> 2.1.2
See https://github.com/troglobit/sysklogd/releases/tag/v2.1.2 Also remove patch applied upstream. 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 @@
-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
-
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
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"
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 @@
-require sysklogd.inc
-
-SRCREV = "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 @@
+require sysklogd.inc
+
+SRCREV = "6d6010add698370fc7d9828f0aaa18613dd2397f"