From 76d1af4fe73fee0696067dfc4dd1bc9a9015416a Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Wed, 17 Feb 2021 14:06:46 +0800 Subject: sysklogd: upgrade 2.1.2 -> 2.2.1 Merge inc and bb files too. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../files/0001-Makefile.am-fixup-issue-17.patch | 43 ----------------- meta/recipes-extended/sysklogd/sysklogd.inc | 54 --------------------- meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb | 3 -- meta/recipes-extended/sysklogd/sysklogd_2.2.1.bb | 56 ++++++++++++++++++++++ 4 files changed, 56 insertions(+), 100 deletions(-) delete mode 100644 meta/recipes-extended/sysklogd/files/0001-Makefile.am-fixup-issue-17.patch delete mode 100644 meta/recipes-extended/sysklogd/sysklogd.inc delete mode 100644 meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb create mode 100644 meta/recipes-extended/sysklogd/sysklogd_2.2.1.bb (limited to 'meta/recipes-extended') 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 -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 ---- - 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 deleted file mode 100644 index 162260f000..0000000000 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "System Log Daemons" -DESCRIPTION = "The sysklogd package implements system log daemons: syslogd" -HOMEPAGE = "http://www.infodrom.org/projects/sysklogd/" -SECTION = "base" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \ - file://src/syslogd.c;beginline=2;endline=15;md5=a880fecbc04503f071c494a9c0dd4f97 \ - " - -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 \ - " -S = "${WORKDIR}/git" - -EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" - -do_install_append () { - install -d ${D}${sysconfdir} - install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf - install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog -} - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "syslogd.service" -SYSTEMD_AUTO_ENABLE = "enable" - -INITSCRIPT_NAME = "syslog" -CONFFILES_${PN} = "${sysconfdir}/syslog.conf" -RCONFLICTS_${PN} = "rsyslog busybox-syslog syslog-ng" - -FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}" - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN}-doc = "syslogd.8" -ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" - -pkg_prerm_${PN} () { - if test "x$D" = "x"; then - if test "$1" = "upgrade" -o "$1" = "remove"; then - /etc/init.d/syslog stop || : - fi - fi -} - -python () { - if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") -} 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" diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.2.1.bb b/meta/recipes-extended/sysklogd/sysklogd_2.2.1.bb new file mode 100644 index 0000000000..aa3f126fbc --- /dev/null +++ b/meta/recipes-extended/sysklogd/sysklogd_2.2.1.bb @@ -0,0 +1,56 @@ +SUMMARY = "System Log Daemons" +DESCRIPTION = "The sysklogd package implements system log daemons: syslogd" +HOMEPAGE = "http://www.infodrom.org/projects/sysklogd/" +SECTION = "base" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \ + file://src/syslogd.c;beginline=2;endline=15;md5=a880fecbc04503f071c494a9c0dd4f97 \ + " + +inherit update-rc.d update-alternatives systemd autotools + +SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ + file://sysklogd \ + " + +SRCREV = "b115c7ec4e6d9f3587ac8d212bfc454bfbfe7023" + +S = "${WORKDIR}/git" + +EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" + +do_install_append () { + install -d ${D}${sysconfdir} + install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog +} + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "syslogd.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_NAME = "syslog" +CONFFILES_${PN} = "${sysconfdir}/syslog.conf" +RCONFLICTS_${PN} = "rsyslog busybox-syslog syslog-ng" + +FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}" + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN}-doc = "syslogd.8" +ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" + +pkg_prerm_${PN} () { + if test "x$D" = "x"; then + if test "$1" = "upgrade" -o "$1" = "remove"; then + /etc/init.d/syslog stop || : + fi + fi +} + +python () { + if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") +} -- cgit 1.2.3-korg