summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGyorgy Sarvari <skandigraun@gmail.com>2025-08-12 15:09:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-08-14 10:31:10 +0100
commit9f694e7ab4546d70db441667e285e62b3762d532 (patch)
tree9500baa04e534b33af7eafcd90d404eb22876434
parenta61f4e9fa449584ad14845067bd9ddc7444f6798 (diff)
downloadpoky-9f694e7ab4546d70db441667e285e62b3762d532.tar.gz
logrotate: avoid testing localized strings
During running ptests, the test suite checks for a localized error string which is different between libc and musl, making this test to fail. Backport an upstream patch that fixes this by not checking for this particular error message. This fixes partially https://bugzilla.yoctoproject.org/show_bug.cgi?id=15811 [YOCTO #15811] (From OE-Core rev: 8b415d9cfe4f8527c4fae23ebdc961499fe85cc4) Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/logrotate/logrotate/0001-test-avoid-locale-dependent-errno-string.patch27
-rw-r--r--meta/recipes-extended/logrotate/logrotate_3.22.0.bb1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-extended/logrotate/logrotate/0001-test-avoid-locale-dependent-errno-string.patch b/meta/recipes-extended/logrotate/logrotate/0001-test-avoid-locale-dependent-errno-string.patch
new file mode 100644
index 0000000000..efee91252d
--- /dev/null
+++ b/meta/recipes-extended/logrotate/logrotate/0001-test-avoid-locale-dependent-errno-string.patch
@@ -0,0 +1,27 @@
1From 04b21743980c4e236ca5e8de18173fbd3848573b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
3Date: Sat, 8 Jun 2024 17:59:40 +0200
4Subject: [PATCH] test: avoid locale dependent errno string
5
6String representations of errno values are locale dependent, thus avoid
7using them.
8
9Upstream-Status: Backport [https://github.com/logrotate/logrotate/commit/04b21743980c4e236ca5e8de18173fbd3848573b]
10Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
11---
12 test/test-0112.sh | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/test/test-0112.sh b/test/test-0112.sh
16index 812632b..fa9eed6 100755
17--- a/test/test-0112.sh
18+++ b/test/test-0112.sh
19@@ -23,7 +23,7 @@ test_reg.log.1.gz 1 zero
20 test_reg.log.2.gz 1 first
21 EOF
22
23-grep "test_fifo.log.1 (read-only) for compression: Operation not supported" error.log >/dev/null
24+grep "^error: unable to open .*/test_fifo\.log\.1 (read-only) for compression: " error.log >/dev/null
25 if [ $? != 0 ]; then
26 echo "No error printed, but there should be one."
27 exit 3
diff --git a/meta/recipes-extended/logrotate/logrotate_3.22.0.bb b/meta/recipes-extended/logrotate/logrotate_3.22.0.bb
index 5c4a0a9807..7995438408 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.22.0.bb
+++ b/meta/recipes-extended/logrotate/logrotate_3.22.0.bb
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
12 12
13SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz \ 13SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz \
14 file://run-ptest \ 14 file://run-ptest \
15 file://0001-test-avoid-locale-dependent-errno-string.patch \
15 " 16 "
16 17
17SRC_URI[sha256sum] = "42b4080ee99c9fb6a7d12d8e787637d057a635194e25971997eebbe8d5e57618" 18SRC_URI[sha256sum] = "42b4080ee99c9fb6a7d12d8e787637d057a635194e25971997eebbe8d5e57618"