diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-extended/sysklogd/sysklogd.inc | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-extended/sysklogd/sysklogd.inc')
-rw-r--r-- | poky/meta/recipes-extended/sysklogd/sysklogd.inc | 54 |
1 files changed, 15 insertions, 39 deletions
diff --git a/poky/meta/recipes-extended/sysklogd/sysklogd.inc b/poky/meta/recipes-extended/sysklogd/sysklogd.inc index 749026f853..8899daa1b0 100644 --- a/poky/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/poky/meta/recipes-extended/sysklogd/sysklogd.inc @@ -1,62 +1,38 @@ SUMMARY = "System Log Daemons" -DESCRIPTION = "The sysklogd package implements two system log daemons: syslogd, klogd" +DESCRIPTION = "The sysklogd package implements system log daemons: syslogd" HOMEPAGE = "http://www.infodrom.org/projects/sysklogd/" SECTION = "base" -LICENSE = "GPLv2+ & BSD" -LICENSE_syslogd = "BSD" -LICENSE_klogd = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ - file://syslogd.c;beginline=2;endline=15;md5=77ffb2fec48c46d7ca0abb2d5813e7fd \ - file://klogd.c;beginline=2;endline=19;md5=7e87ed0ae6142de079bce738c10c899d \ +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 +inherit update-rc.d update-alternatives systemd autotools SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ - file://no-strip-install.patch \ - file://0001-Fix-build-with-musl.patch \ - file://0001-fix-problems-that-causes-a-segmentation-fault-under-.patch \ - file://0002-Make-way-for-respecting-flags-from-environment.patch \ file://sysklogd \ - file://syslog.conf \ - file://syslogd.service \ - file://klogd.service \ - file://tmpfiles.sysklogd.conf \ + file://0001-fix-one-rarely-reproduced-parallel-build-problem.patch \ " S = "${WORKDIR}/git" -SRC_URI_append_e500v2 = " file://no-vectorization.patch" +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 klogd.service" +SYSTEMD_SERVICE_${PN} = "syslogd.service" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "syslog" CONFFILES_${PN} = "${sysconfdir}/syslog.conf" RCONFLICTS_${PN} = "rsyslog busybox-syslog syslog-ng" -CFLAGS += "-DSYSV -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" - -do_install () { - install -d ${D}${mandir}/man8 \ - ${D}${mandir}/man5 \ - ${D}${base_sbindir} - oe_runmake 'BINDIR=${D}${base_sbindir}' \ - 'MANDIR=${D}${mandir}' install - install -d ${D}${sysconfdir} - install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf - install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/syslogd.service ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/klogd.service ${D}${systemd_unitdir}/system - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true', 'false', d)}; then - install -d ${D}${exec_prefix}/lib/tmpfiles.d - install -m 644 ${WORKDIR}/tmpfiles.sysklogd.conf ${D}${exec_prefix}/lib/tmpfiles.d/sysklogd.conf - fi -} - FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}" ALTERNATIVE_PRIORITY = "100" |