summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch118
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_8.1903.0.bb (renamed from meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb)11
2 files changed, 7 insertions, 122 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch
deleted file mode 100644
index a248f75e5b..0000000000
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch
+++ /dev/null
@@ -1,118 +0,0 @@
1From 07ad2a1905089b9124623324a9969e4522317110 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Fri, 12 Sep 2014 03:41:11 -0400
4Subject: [PATCH] rsyslog: update configure to fix ptest
5
6$MaxMessageSize doesn't work if before $IncludeConfig diag-common.conf, then
7test cases fall into infinite loop with error message:
8
98062.511110729:4902c480: error: message received is larger than max msg size, we split it
108062.511152265:4902c480: discarding zero-sized message
11
12Update configure to fix it.
13
14Upstream-Status: Pending
15
16Signed-off-by: Kai Kang <kai.kang@windriver.com>
17
18---
19 tests/testsuites/complex1.conf | 2 +-
20 tests/testsuites/gzipwr_large.conf | 2 +-
21 tests/testsuites/gzipwr_large_dynfile.conf | 2 +-
22 tests/testsuites/imptcp_conndrop.conf | 2 +-
23 tests/testsuites/imptcp_large.conf | 2 +-
24 tests/testsuites/imtcp_conndrop.conf | 2 +-
25 tests/testsuites/wr_large.conf | 2 +-
26 7 files changed, 7 insertions(+), 7 deletions(-)
27
28diff --git a/tests/testsuites/complex1.conf b/tests/testsuites/complex1.conf
29index 9b6a9f3..e00caa4 100644
30--- a/tests/testsuites/complex1.conf
31+++ b/tests/testsuites/complex1.conf
32@@ -1,7 +1,7 @@
33 # complex test case with multiple actions in gzip mode
34 # rgerhards, 2009-05-22
35-$MaxMessageSize 10k
36 $IncludeConfig diag-common.conf
37+$MaxMessageSize 10k
38
39 $MainMsgQueueTimeoutEnqueue 5000
40
41diff --git a/tests/testsuites/gzipwr_large.conf b/tests/testsuites/gzipwr_large.conf
42index 54ad3bb..e8247a9 100644
43--- a/tests/testsuites/gzipwr_large.conf
44+++ b/tests/testsuites/gzipwr_large.conf
45@@ -1,7 +1,7 @@
46 # simple async writing test
47 # rgerhards, 2010-03-09
48-$MaxMessageSize 10k
49 $IncludeConfig diag-common.conf
50+$MaxMessageSize 10k
51
52 $ModLoad ../plugins/imtcp/.libs/imtcp
53 $MainMsgQueueTimeoutShutdown 10000
54diff --git a/tests/testsuites/gzipwr_large_dynfile.conf b/tests/testsuites/gzipwr_large_dynfile.conf
55index 3a1b255..297cb70 100644
56--- a/tests/testsuites/gzipwr_large_dynfile.conf
57+++ b/tests/testsuites/gzipwr_large_dynfile.conf
58@@ -1,7 +1,7 @@
59 # simple async writing test
60 # rgerhards, 2010-03-09
61-$MaxMessageSize 10k
62 $IncludeConfig diag-common.conf
63+$MaxMessageSize 10k
64
65 $ModLoad ../plugins/imtcp/.libs/imtcp
66 $MainMsgQueueTimeoutShutdown 10000
67diff --git a/tests/testsuites/imptcp_conndrop.conf b/tests/testsuites/imptcp_conndrop.conf
68index 77a5d79..d9a14a8 100644
69--- a/tests/testsuites/imptcp_conndrop.conf
70+++ b/tests/testsuites/imptcp_conndrop.conf
71@@ -1,7 +1,7 @@
72 # simple async writing test
73 # rgerhards, 2010-03-09
74-$MaxMessageSize 10k
75 $IncludeConfig diag-common.conf
76+$MaxMessageSize 10k
77
78 $ModLoad ../plugins/imptcp/.libs/imptcp
79 $MainMsgQueueTimeoutShutdown 10000
80diff --git a/tests/testsuites/imptcp_large.conf b/tests/testsuites/imptcp_large.conf
81index 77a5d79..d9a14a8 100644
82--- a/tests/testsuites/imptcp_large.conf
83+++ b/tests/testsuites/imptcp_large.conf
84@@ -1,7 +1,7 @@
85 # simple async writing test
86 # rgerhards, 2010-03-09
87-$MaxMessageSize 10k
88 $IncludeConfig diag-common.conf
89+$MaxMessageSize 10k
90
91 $ModLoad ../plugins/imptcp/.libs/imptcp
92 $MainMsgQueueTimeoutShutdown 10000
93diff --git a/tests/testsuites/imtcp_conndrop.conf b/tests/testsuites/imtcp_conndrop.conf
94index de41bc4..7844dc7 100644
95--- a/tests/testsuites/imtcp_conndrop.conf
96+++ b/tests/testsuites/imtcp_conndrop.conf
97@@ -1,7 +1,7 @@
98 # simple async writing test
99 # rgerhards, 2010-03-09
100-$MaxMessageSize 10k
101 $IncludeConfig diag-common.conf
102+$MaxMessageSize 10k
103
104 $ModLoad ../plugins/imtcp/.libs/imtcp
105 $MainMsgQueueTimeoutShutdown 10000
106diff --git a/tests/testsuites/wr_large.conf b/tests/testsuites/wr_large.conf
107index b64f132..b0ae264 100644
108--- a/tests/testsuites/wr_large.conf
109+++ b/tests/testsuites/wr_large.conf
110@@ -1,7 +1,7 @@
111 # simple async writing test
112 # rgerhards, 2010-03-09
113-$MaxMessageSize 10k
114 $IncludeConfig diag-common.conf
115+$MaxMessageSize 10k
116
117 $ModLoad ../plugins/imtcp/.libs/imtcp
118 $MainMsgQueueTimeoutShutdown 10000
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1903.0.bb
index 1fb4390150..e06141e816 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1903.0.bb
@@ -23,15 +23,15 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t
23 file://rsyslog.logrotate \ 23 file://rsyslog.logrotate \
24 file://use-pkgconfig-to-check-libgcrypt.patch \ 24 file://use-pkgconfig-to-check-libgcrypt.patch \
25 file://run-ptest \ 25 file://run-ptest \
26 file://rsyslog-fix-ptest-not-finish.patch \
27" 26"
28 27
29SRC_URI_append_libc-musl = " \ 28SRC_URI_append_libc-musl = " \
30 file://0001-Include-sys-time-h.patch \ 29 file://0001-Include-sys-time-h.patch \
31" 30"
32 31
33SRC_URI[md5sum] = "e0942b4b88a13602a6b6352bf9f05091" 32SRC_URI[md5sum] = "f0d454c79d4040e3f25fcd12f8f33fe2"
34SRC_URI[sha256sum] = "295c289b4c8abd8f8f3fe35a83249b739cedabe82721702b910255f9faf147e7" 33SRC_URI[sha256sum] = "d0d23a493dcec64c7b6807a1bb8ee864ed0f3760c2ff3088008bb661d304056f"
34
35 35
36UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" 36UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases"
37UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" 37UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
@@ -162,5 +162,8 @@ VALGRIND_mips64n32 = ""
162VALGRIND_arm = "" 162VALGRIND_arm = ""
163VALGRIND_aarch64 = "" 163VALGRIND_aarch64 = ""
164VALGRIND_riscv64 = "" 164VALGRIND_riscv64 = ""
165RDEPENDS_${PN}-ptest += "make diffutils gzip bash gawk coreutils procps" 165RDEPENDS_${PN}-ptest += "\
166 make diffutils gzip bash gawk coreutils procps \
167 libgcc python-core python-io \
168 "
166RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" 169RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-31 14:41:37 +0000