diff options
Diffstat (limited to 'meta-oe/recipes-extended')
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest | 5 | ||||
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_8.2002.0.bb (renamed from meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb) | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest b/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest index 3770a7506..aa698d85c 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest | |||
@@ -1,3 +1,8 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | # |
3 | set -e | ||
4 | set -o pipefail | ||
5 | |||
6 | SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" | ||
7 | cd ${SCRIPTPATH} | ||
3 | make -C tests -k check-TESTS | 8 | make -C tests -k check-TESTS |
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2002.0.bb index f82caf7b5..6a90614bf 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2002.0.bb | |||
@@ -29,8 +29,8 @@ SRC_URI_append_libc-musl = " \ | |||
29 | file://0001-Include-sys-time-h.patch \ | 29 | file://0001-Include-sys-time-h.patch \ |
30 | " | 30 | " |
31 | 31 | ||
32 | SRC_URI[md5sum] = "154e33feb587216f2955050a8301104c" | 32 | SRC_URI[md5sum] = "fbe6d18205170e22bad470954d0dc874" |
33 | SRC_URI[sha256sum] = "e1f4776b1c62ad7220f4d624a89a96b0c3d4738006899356eaaef0f1f91ee104" | 33 | SRC_URI[sha256sum] = "fe86c14d860da1202c76616feac0539ea5a40a4ad182d74b7d6d2419cc2381f8" |
34 | 34 | ||
35 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" | 35 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" |
36 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 36 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
@@ -131,6 +131,8 @@ do_install_ptest() { | |||
131 | # fix the module load path with runtime/.libs | 131 | # fix the module load path with runtime/.libs |
132 | find ${D}${PTEST_PATH}/${TESTDIR} -name "*.conf" -o -name "*.sh" -o -name "*.c" | xargs \ | 132 | find ${D}${PTEST_PATH}/${TESTDIR} -name "*.conf" -o -name "*.sh" -o -name "*.c" | xargs \ |
133 | sed -i -e 's:../plugins/.*/.libs/:../runtime/.libs/:g' | 133 | sed -i -e 's:../plugins/.*/.libs/:../runtime/.libs/:g' |
134 | # fix the python3 path for tests/set-envar | ||
135 | sed -i -e s:${HOSTTOOLS_DIR}:${bindir}:g ${D}${PTEST_PATH}/tests/set-envvars | ||
134 | } | 136 | } |
135 | 137 | ||
136 | do_install_append() { | 138 | do_install_append() { |