diff options
| author | Randy MacLeod <randy.macleod@windriver.com> | 2020-01-05 11:42:58 -0500 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-01-06 08:24:45 -0800 |
| commit | 346b5c63f90220c5bbd9626eaf951a61a7a7350d (patch) | |
| tree | d447308ab6545995c761a6b72cdc6933bdf559e4 /meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb | |
| parent | f602e9f1e14ac2c9f0d094b9d8c7605aa6df9767 (diff) | |
| download | meta-openembedded-346b5c63f90220c5bbd9626eaf951a61a7a7350d.tar.gz | |
rsyslog: update from 8.1910 to 8.1911
ptest results for qemux86-64 with kvm and a timeout
of 1000 seconds to allow stress tests to complete:
Recipe | Passed | Failed | Skipped
rsyslog-8.1908.0 | 379 | 4 | 2
rsyslog-8.1911.0 | 381 | 4 | 3
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb')
| -rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb | 190 |
1 files changed, 0 insertions, 190 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb deleted file mode 100644 index e8afae4ef2..0000000000 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb +++ /dev/null | |||
| @@ -1,190 +0,0 @@ | |||
| 1 | SUMMARY = "Rsyslog is an enhanced multi-threaded syslogd" | ||
| 2 | DESCRIPTION = "\ | ||
| 3 | Rsyslog is an enhanced syslogd supporting, among others, MySQL,\ | ||
| 4 | PostgreSQL, failover log destinations, syslog/tcp, fine grain\ | ||
| 5 | output format control, high precision timestamps, queued operations\ | ||
| 6 | and the ability to filter on any message part. It is quite\ | ||
| 7 | compatible to stock sysklogd and can be used as a drop-in replacement.\ | ||
| 8 | Its advanced features make it suitable for enterprise-class,\ | ||
| 9 | encryption protected syslog relay chains while at the same time being\ | ||
| 10 | very easy to setup for the novice user." | ||
| 11 | |||
| 12 | DEPENDS = "zlib libestr libfastjson bison-native flex-native liblogging" | ||
| 13 | HOMEPAGE = "http://www.rsyslog.com/" | ||
| 14 | LICENSE = "GPLv3 & LGPLv3 & Apache-2.0" | ||
| 15 | LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \ | ||
| 16 | file://COPYING.LESSER;md5=cb7903f1e5c39ae838209e130dca270a \ | ||
| 17 | file://COPYING.ASL20;md5=052f8a09206615ab07326ff8ce2d9d32\ | ||
| 18 | " | ||
| 19 | |||
| 20 | SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.tar.gz \ | ||
| 21 | file://initscript \ | ||
| 22 | file://rsyslog.conf \ | ||
| 23 | file://rsyslog.logrotate \ | ||
| 24 | file://use-pkgconfig-to-check-libgcrypt.patch \ | ||
| 25 | file://run-ptest \ | ||
| 26 | " | ||
| 27 | |||
| 28 | SRC_URI_append_libc-musl = " \ | ||
| 29 | file://0001-Include-sys-time-h.patch \ | ||
| 30 | " | ||
| 31 | |||
| 32 | SRC_URI[md5sum] = "6d4d94359d083f449f089b8dbb93c423" | ||
| 33 | SRC_URI[sha256sum] = "0219ee692f31a39743acb62aaf4196b644ce94edf386df4605fd6a11a4fe0c93" | ||
| 34 | |||
| 35 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" | ||
| 36 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
| 37 | |||
| 38 | inherit autotools pkgconfig systemd update-rc.d ptest | ||
| 39 | |||
| 40 | EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" | ||
| 41 | EXTRA_OECONF += "--enable-imfile-tests" | ||
| 42 | EXTRA_OECONF_remove_mipsarch = "ap_cv_atomic_builtins=yes" | ||
| 43 | EXTRA_OECONF_remove_powerpc = "ap_cv_atomic_builtins=yes" | ||
| 44 | |||
| 45 | # first line is default yes in configure | ||
| 46 | PACKAGECONFIG ??= " \ | ||
| 47 | rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ | ||
| 48 | fmhttp imdiag gnutls imfile \ | ||
| 49 | ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \ | ||
| 50 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ | ||
| 51 | " | ||
| 52 | |||
| 53 | # default yes in configure | ||
| 54 | PACKAGECONFIG[relp] = "--enable-relp,--disable-relp,librelp," | ||
| 55 | PACKAGECONFIG[rsyslogd] = "--enable-rsyslogd,--disable-rsyslogd,," | ||
| 56 | PACKAGECONFIG[rsyslogrt] = "--enable-rsyslogrt,--disable-rsyslogrt,," | ||
| 57 | PACKAGECONFIG[fmhttp] = "--enable-fmhttp,--disable-fmhttp,curl," | ||
| 58 | PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,," | ||
| 59 | PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,," | ||
| 60 | PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,," | ||
| 61 | PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," | ||
| 62 | PACKAGECONFIG[libgcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt," | ||
| 63 | PACKAGECONFIG[testbench] = "--enable-testbench --enable-omstdout,--disable-testbench --disable-omstdout,," | ||
| 64 | |||
| 65 | # default no in configure | ||
| 66 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," | ||
| 67 | PACKAGECONFIG[imdiag] = "--enable-imdiag,--disable-imdiag,," | ||
| 68 | PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,," | ||
| 69 | PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," | ||
| 70 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," | ||
| 71 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," | ||
| 72 | PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," | ||
| 73 | PACKAGECONFIG[mmjsonparse] = "--enable-mmjsonparse,--disable-mmjsonparse," | ||
| 74 | PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," | ||
| 75 | PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," | ||
| 76 | PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," | ||
| 77 | PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," | ||
| 78 | PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," | ||
| 79 | |||
| 80 | TESTDIR = "tests" | ||
| 81 | do_compile_ptest() { | ||
| 82 | echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile | ||
| 83 | oe_runmake -C ${TESTDIR} buildtest-TESTS | ||
| 84 | } | ||
| 85 | |||
| 86 | do_install_ptest() { | ||
| 87 | # install the tests | ||
| 88 | cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH} | ||
| 89 | cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} | ||
| 90 | |||
| 91 | # do NOT need to rebuild Makefile itself | ||
| 92 | sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
| 93 | # do NOT need to rebuild $(check_PROGRAMS) | ||
| 94 | sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
| 95 | |||
| 96 | # fix the srcdir, top_srcdir | ||
| 97 | sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
| 98 | sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
| 99 | # fix the abs_top_builddir | ||
| 100 | sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
| 101 | |||
| 102 | # valgrind is not compatible with arm and mips, | ||
| 103 | # so remove related test cases if there is no valgrind. | ||
| 104 | if [ x${VALGRIND} = x ]; then | ||
| 105 | sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
| 106 | fi | ||
| 107 | |||
| 108 | # install test-driver | ||
| 109 | install -m 644 ${S}/test-driver ${D}${PTEST_PATH} | ||
| 110 | |||
| 111 | # install necessary links | ||
| 112 | install -d ${D}${PTEST_PATH}/tools | ||
| 113 | ln -sf ${sbindir}/rsyslogd ${D}${PTEST_PATH}/tools/rsyslogd | ||
| 114 | |||
| 115 | install -d ${D}${PTEST_PATH}/runtime | ||
| 116 | install -d ${D}${PTEST_PATH}/runtime/.libs | ||
| 117 | ( | ||
| 118 | cd ${D}/${libdir}/rsyslog | ||
| 119 | allso="*.so" | ||
| 120 | for i in $allso; do | ||
| 121 | ln -sf ${libdir}/rsyslog/$i ${D}${PTEST_PATH}/runtime/.libs/$i | ||
| 122 | done | ||
| 123 | ) | ||
| 124 | |||
| 125 | # fix the module load path with runtime/.libs | ||
| 126 | find ${D}${PTEST_PATH}/${TESTDIR} -name "*.conf" -o -name "*.sh" -o -name "*.c" | xargs \ | ||
| 127 | sed -i -e 's:../plugins/.*/.libs/:../runtime/.libs/:g' | ||
| 128 | } | ||
| 129 | |||
| 130 | do_install_append() { | ||
| 131 | install -d "${D}${sysconfdir}/init.d" | ||
| 132 | install -d "${D}${sysconfdir}/logrotate.d" | ||
| 133 | install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog | ||
| 134 | install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf | ||
| 135 | install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog | ||
| 136 | sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog | ||
| 137 | |||
| 138 | if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then | ||
| 139 | install -d 0755 ${D}${sysconfdir}/rsyslog.d | ||
| 140 | echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf | ||
| 141 | fi | ||
| 142 | if ${@bb.utils.contains('PACKAGECONFIG', 'mmjsonparse', 'true', 'false', d)}; then | ||
| 143 | install -d 0755 ${D}${sysconfdir}/rsyslog.d | ||
| 144 | echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf | ||
| 145 | fi | ||
| 146 | } | ||
| 147 | |||
| 148 | FILES_${PN} += "${bindir}" | ||
| 149 | |||
| 150 | INITSCRIPT_NAME = "syslog" | ||
| 151 | INITSCRIPT_PARAMS = "defaults" | ||
| 152 | |||
| 153 | CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf" | ||
| 154 | |||
| 155 | RCONFLICTS_${PN} = "busybox-syslog sysklogd syslog-ng" | ||
| 156 | |||
| 157 | RPROVIDES_${PN} += "${PN}-systemd" | ||
| 158 | RREPLACES_${PN} += "${PN}-systemd" | ||
| 159 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
| 160 | SYSTEMD_SERVICE_${PN} = "${BPN}.service" | ||
| 161 | |||
| 162 | RDEPENDS_${PN} += "logrotate" | ||
| 163 | |||
| 164 | # for rsyslog-ptest | ||
| 165 | VALGRIND = "valgrind" | ||
| 166 | |||
| 167 | # valgrind supports armv7 and above | ||
| 168 | VALGRIND_armv4 = '' | ||
| 169 | VALGRIND_armv5 = '' | ||
| 170 | VALGRIND_armv6 = '' | ||
| 171 | |||
| 172 | # X32 isn't supported by valgrind at this time | ||
| 173 | VALGRIND_linux-gnux32 = '' | ||
| 174 | VALGRIND_linux-muslx32 = '' | ||
| 175 | |||
| 176 | # Disable for some MIPS variants | ||
| 177 | VALGRIND_mipsarchr6 = '' | ||
| 178 | VALGRIND_linux-gnun32 = '' | ||
| 179 | |||
| 180 | # Disable for powerpc64 with musl | ||
| 181 | VALGRIND_libc-musl_powerpc64 = '' | ||
| 182 | |||
| 183 | # RISC-V support for valgrind is not there yet | ||
| 184 | VALGRIND_riscv64 = "" | ||
| 185 | |||
| 186 | RDEPENDS_${PN}-ptest += "\ | ||
| 187 | make diffutils gzip bash gawk coreutils procps \ | ||
| 188 | libgcc python-core python-io \ | ||
| 189 | " | ||
| 190 | RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" | ||
