diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/rsyslog')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.6.0.bb (renamed from meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.5.0.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb (renamed from meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2002.0.bb) | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.6.0.bb index a4663148c..f3933f930 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.6.0.bb @@ -9,7 +9,7 @@ DEPENDS = "gmp nettle libidn zlib gnutls openssl" SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https \ " -SRCREV = "0beb2258e12e4131dc31e261078ea53d18f787d7" +SRCREV = "fe366f3770320cbe76bac7e84b26a48491d14531" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2002.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb index ca8fddc71..b6c2a991f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2002.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb @@ -29,8 +29,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "fbe6d18205170e22bad470954d0dc874" -SRC_URI[sha256sum] = "fe86c14d860da1202c76616feac0539ea5a40a4ad182d74b7d6d2419cc2381f8" +SRC_URI[md5sum] = "33de768941953ceeca9d1a437b47891b" +SRC_URI[sha256sum] = "d9589e64866f2fdc5636af4cae9d60ebf1e3257bb84b81ee953ede6a05878e97" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" @@ -76,7 +76,7 @@ PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," -PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," +PACKAGECONFIG[valgrind] = ",--without-valgrind-testbench,valgrind," do_configure_prepend() { sed -i -e 's|python |python3 |g' ${S}/tests/*.sh @@ -106,12 +106,6 @@ do_install_ptest() { # fix the abs_top_builddir sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - # valgrind is not compatible with arm and mips, - # so remove related test cases if there is no valgrind. - if [ x${VALGRIND} = x ]; then - sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - fi - # install test-driver install -m 644 ${S}/test-driver ${D}${PTEST_PATH} @@ -152,6 +146,10 @@ do_install_append() { install -d 0755 ${D}${sysconfdir}/rsyslog.d echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf fi + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + sed -i -e "s#;Requires=syslog.socket#Requires=syslog.socket#g" ${D}${systemd_system_unitdir}/rsyslog.service + sed -i -e "s#;Alias=syslog.service#Alias=syslog.service#g" ${D}${systemd_system_unitdir}/rsyslog.service + fi } FILES_${PN} += "${bindir}" |