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 @@ +From 04b21743980c4e236ca5e8de18173fbd3848573b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= +Date: Sat, 8 Jun 2024 17:59:40 +0200 +Subject: [PATCH] test: avoid locale dependent errno string + +String representations of errno values are locale dependent, thus avoid +using them. + +Upstream-Status: Backport [https://github.com/logrotate/logrotate/commit/04b21743980c4e236ca5e8de18173fbd3848573b] +Signed-off-by: Gyorgy Sarvari +--- + test/test-0112.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/test-0112.sh b/test/test-0112.sh +index 812632b..fa9eed6 100755 +--- a/test/test-0112.sh ++++ b/test/test-0112.sh +@@ -23,7 +23,7 @@ test_reg.log.1.gz 1 zero + test_reg.log.2.gz 1 first + EOF + +-grep "test_fifo.log.1 (read-only) for compression: Operation not supported" error.log >/dev/null ++grep "^error: unable to open .*/test_fifo\.log\.1 (read-only) for compression: " error.log >/dev/null + if [ $? != 0 ]; then + echo "No error printed, but there should be one." + 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" SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz \ file://run-ptest \ + file://0001-test-avoid-locale-dependent-errno-string.patch \ " SRC_URI[sha256sum] = "42b4080ee99c9fb6a7d12d8e787637d057a635194e25971997eebbe8d5e57618"