From 7a0edf425e4b930dd8e246269d1fbfefc300d907 Mon Sep 17 00:00:00 2001 From: Haiqing Bai Date: Tue, 15 Sep 2020 17:18:49 +0800 Subject: rsyslog: fix wrong option of PACKAGECONFIG[valgrind] The source configure.ac shows: --enable-valgrind: Enable somes special code that rsyslog core developers consider useful for testing.Do NOT use if you don't exactly know what you are doing, except if told so by rsyslog developers. NOT to be used by distro maintainers for building regular packages. --without-valgrind-testbench: Don't use valgrind in testbench PACKAGECONFIG[valgrind] should use '--without-valgrind-testbench' And after this fix, the code which removes the valgrind depended ptest cases for arm,mips is no longer needed. Signed-off-by: Haiqing Bai Signed-off-by: Khem Raj --- meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb index 524cd9ead1..b6c2a991fc 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb @@ -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} -- cgit 1.2.3-korg