From: "Anuj Mittal" <anuj.mittal@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 13/27] sysklogd: upgrade 2.1.2 -> 2.2.1
Date: Wed, 17 Feb 2021 13:51:56 +0800 [thread overview]
Message-ID: <20210217055210.22019-13-anuj.mittal@intel.com> (raw)
In-Reply-To: <20210217055210.22019-1-anuj.mittal@intel.com>
Merge inc and bb files too.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../0001-Makefile.am-fixup-issue-17.patch | 43 -------------------
meta/recipes-extended/sysklogd/sysklogd.inc | 4 +-
.../sysklogd/sysklogd_2.1.2.bb | 3 --
3 files changed, 3 insertions(+), 47 deletions(-)
delete mode 100644 meta/recipes-extended/sysklogd/files/0001-Makefile.am-fixup-issue-17.patch
delete mode 100644 meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb
diff --git a/meta/recipes-extended/sysklogd/files/0001-Makefile.am-fixup-issue-17.patch b/meta/recipes-extended/sysklogd/files/0001-Makefile.am-fixup-issue-17.patch
deleted file mode 100644
index 96365648d7..0000000000
--- a/meta/recipes-extended/sysklogd/files/0001-Makefile.am-fixup-issue-17.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a4a472c19eaaf03cc0e70797b2d24b540d6424e1 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 3 Jun 2020 13:39:18 +0800
-Subject: [PATCH] Makefile.am: fixup issue #17
-
-only make $(LIBOBJS) depend on $(LTLIBOBJS) still have race condition,
-library like pidfile.o may be changed when compile or link for
-libsyslog_la_LIBADD, which will cause problem like below:
-
-ERROR: dwarfsrcfiles failed with exit code 1 (cmd was ['dwarfsrcfiles', /tmp/work/ppc7400-oe-linux/sysklogd/2.1.2-r0/package/usr/lib/libsyslog.a']):
-dwarfsrcfiles: tmp/work/ppc7400-oe-linux/sysklogd/2.1.2-r0/package/usr/lib/libsyslog.a: not a valid ELF file
-
-arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=TOPDIR/tmp-glibc/work/armv7vet2hf-neon-oe-linux-gnueabi/sysklogd/2.1.2-r0/recipe-sysroot -shared -fPIC -DPIC .libs/libsyslog_la-syslog.o ../lib/.libs/pidfile.o ../lib/.libs/strlcpy.o ../lib/.libs/strlcat.o -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=TOPDIR/tmp-glibc/work/armv7vet2hf-neon-oe-linux-gnueabi/sysklogd/2.1.2-r0/recipe-sysroot -O2 -g -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname -Wl,libsyslog.so.0 -o .libs/libsyslog.so.0.0.0
-arm-oe-linux-gnueabi-libtool: link: (cd ".libs" && rm -f "libsyslog.so.0" && ln -s "libsyslog.so.0.0.0" "libsyslog.so.0")
-arm-oe-linux-gnueabi-libtool: link: (cd ".libs" && rm -f "libsyslog.so" && ln -s "libsyslog.so.0.0.0" "libsyslog.so")
-arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc-ar cru .libs/libsyslog.a libsyslog_la-syslog.o ../lib/pidfile.o ../lib/strlcpy.o ../lib/strlcat.o
-TOPDIR/tmp-glibc/work/armv7vet2hf-neon-oe-linux-gnueabi/sysklogd/2.1.2-r0/recipe-sysroot-native/usr/bin/arm-oe-linux-gnueabi/../../libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/10.1.0/ar: `u' modifier ignored since `D' is the default (see `U')
-TOPDIR/tmp-glibc/work/armv7vet2hf-neon-oe-linux-gnueabi/sysklogd/2.1.2-r0/recipe-sysroot-native/usr/bin/arm-oe-linux-gnueabi/../../libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/10.1.0/ar: ../lib/strlcat.o: No such file or directory
-
-Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/23/commits/e684939559341cb1c6373dfc6469b59e580d80af]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- src/Makefile.am | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f8a6820..f45c773 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -66,6 +66,7 @@ libsyslog_la_LIBADD = $(LTLIBOBJS)
- # ld: syslogd-syslogd.o: in function `main': syslogd.c:417: undefined
- # reference to `__pidfile'
- #
--# Work around the problem by building one .o from lib at a time, this
--# can be achieved by making LIBOBJS depend on LTLIBOBJS.
--$(LIBOBJS): $(LTLIBOBJS)
-+# Work around the problem by make LIBOBJS depend on libsyslog.la,
-+# so that LIBOBJS/syslogd/logger will start compile after libsyslog.la
-+# is completed
-+$(LIBOBJS): $(lib_LTLIBRARIES)
---
-2.17.1
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 162260f000..aa3f126fbc 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -12,8 +12,10 @@ inherit update-rc.d update-alternatives systemd autotools
SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \
file://sysklogd \
- file://0001-Makefile.am-fixup-issue-17.patch \
"
+
+SRCREV = "b115c7ec4e6d9f3587ac8d212bfc454bfbfe7023"
+
S = "${WORKDIR}/git"
EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger"
diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb b/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb
deleted file mode 100644
index 2917c2aae0..0000000000
--- a/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require sysklogd.inc
-
-SRCREV = "6d6010add698370fc7d9828f0aaa18613dd2397f"
--
2.29.2
next prev parent reply other threads:[~2021-02-17 5:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 5:51 [PATCH 01/27] git: upgrade 2.30.0 -> 2.30.1 Anuj Mittal
2021-02-17 5:51 ` [PATCH 02/27] glib-2.0: upgrade 2.66.4 -> 2.66.7 Anuj Mittal
2021-02-17 5:51 ` [PATCH 03/27] help2man: upgrade 1.47.16 -> 1.48.1 Anuj Mittal
2021-02-17 5:51 ` [PATCH 04/27] libevdev: upgrade 1.10.1 -> 1.11.0 Anuj Mittal
2021-02-17 5:51 ` [PATCH 05/27] stress-ng: upgrade 0.12.02 -> 0.12.03 Anuj Mittal
2021-02-17 5:51 ` [PATCH 06/27] vte: upgrade 0.62.1 -> 0.62.2 Anuj Mittal
2021-02-17 5:51 ` [PATCH 07/27] x264: upgrade to latest revision Anuj Mittal
2021-02-17 5:51 ` [PATCH 08/27] createrepo-c: upgrade 0.16.2 -> 0.17.0 Anuj Mittal
2021-02-17 5:51 ` [PATCH 09/27] libuv: upgrade 1.40.0 -> 1.41.0 Anuj Mittal
2021-02-17 5:51 ` [PATCH 10/27] piglit: upgrade to latest revision Anuj Mittal
2021-02-17 5:51 ` [PATCH 11/27] pigz: upgrade 2.4 -> 2.6 Anuj Mittal
2021-02-17 5:51 ` [PATCH 12/27] python3-git: upgrade 3.1.12 -> 3.1.13 Anuj Mittal
2021-02-17 5:51 ` Anuj Mittal [this message]
2021-02-17 5:51 ` [PATCH 14/27] sysstat: upgrade 12.4.2 -> 12.4.3 Anuj Mittal
2021-02-17 5:51 ` [PATCH 15/27] python3-hypothesis: upgrade 6.0.2 -> 6.2.0 Anuj Mittal
2021-02-17 5:51 ` [PATCH 16/27] python3-jinja2: upgrade 2.11.2 -> 2.11.3 Anuj Mittal
2021-02-17 5:52 ` [PATCH 17/27] python3-more-itertools: upgrade 8.6.0 -> 8.7.0 Anuj Mittal
2021-02-17 5:52 ` [PATCH 18/27] python3-numpy: upgrade 1.20.0 -> 1.20.1 Anuj Mittal
2021-02-17 5:52 ` [PATCH 19/27] python3-pygments: upgrade 2.7.4 -> 2.8.0 Anuj Mittal
2021-02-17 5:52 ` [PATCH 20/27] python3-pytest: upgrade 6.2.1 -> 6.2.2 Anuj Mittal
2021-02-17 5:52 ` [PATCH 21/27] python3-setuptools: upgrade 52.0.0 -> 53.0.0 Anuj Mittal
2021-02-17 5:52 ` [PATCH 22/27] psmisc: upgrade 23.3 -> 23.4 Anuj Mittal
2021-02-17 5:52 ` [PATCH 23/27] gtk+3: upgrade 3.24.24 -> 3.24.25 Anuj Mittal
2021-02-17 5:52 ` [PATCH 24/27] lighttpd: upgrade 1.4.58 -> 1.4.59 Anuj Mittal
2021-02-17 5:52 ` [PATCH 25/27] libwebp: upgrade 1.1.0 -> 1.2.0 Anuj Mittal
2021-02-17 5:52 ` [PATCH 26/27] libcap: upgrade 2.47 -> 2.48 Anuj Mittal
2021-02-17 5:52 ` [PATCH 27/27] libxt: upgrade 1.2.0 -> 1.2.1 Anuj Mittal
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=20210217055210.22019-13-anuj.mittal@intel.com \
--to=anuj.mittal@intel.com \
--cc=openembedded-core@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox