diff --git a/meta/recipes-core/images/core-image-ptest.bb b/meta/recipes-core/images/core-image-ptest.bb index 22bb23c0e73..99891ff8e00 100644 --- a/meta/recipes-core/images/core-image-ptest.bb +++ b/meta/recipes-core/images/core-image-ptest.bb @@ -49,6 +49,7 @@ QB_MEM:virtclass-mcextend-tcl = "-m 5100" QB_MEM:virtclass-mcextend-go = "-m 4096" QB_MEM:virtclass-mcextend-gnutls = "-m 1536" QB_MEM:virtclass-mcextend-zstd = "-m 4096" +QB_MEM:virtclass-mcextend-icu = "-m 4096" TEST_SUITES = "ping ssh parselogs ptest" diff --git a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch index c0e9e2806b4..a17e4a95631 100644 --- a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch @@ -1,4 +1,4 @@ -From 0f4e9eee64bd4220aa4fae1ab4f7bbf10b87cd69 Mon Sep 17 00:00:00 2001 +From 4438ec38c596c273095e114ab683c297c04ac00e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 15 Feb 2014 21:06:42 +0000 Subject: [PATCH] Disable LDFLAGSICUDT for Linux diff --git a/meta/recipes-support/icu/icu/0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch b/meta/recipes-support/icu/icu/0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch index 0bf1910d187..602d3270302 100644 --- a/meta/recipes-support/icu/icu/0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch +++ b/meta/recipes-support/icu/icu/0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch @@ -1,4 +1,4 @@ -From 4b3e6888c2aaba6465f1bc96f61b17a2513050f3 Mon Sep 17 00:00:00 2001 +From 9d3534a96511fb760fd5c50ce53f37c53874029f Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 21 Jun 2025 12:28:15 +0200 Subject: [PATCH] ICU-23120 Mask UnicodeStringTest::TestLargeMemory on 32-bit @@ -11,7 +11,7 @@ Signed-off-by: Daisuke Yamane 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/intltest/ustrtest.cpp b/test/intltest/ustrtest.cpp -index 56976b3e3d2..26225f5b5b5 100644 +index 3f382c5..6049332 100644 --- a/test/intltest/ustrtest.cpp +++ b/test/intltest/ustrtest.cpp @@ -2375,7 +2375,7 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() { @@ -23,6 +23,3 @@ index 56976b3e3d2..26225f5b5b5 100644 if(quick) { return; } IcuTestErrorCode status(*this, "TestLargeMemory"); constexpr uint32_t len = 2147483643; --- -2.43.0 - diff --git a/meta/recipes-support/icu/icu/0001-Make-ICU-test-output-compatible-with-Automake-format.patch b/meta/recipes-support/icu/icu/0001-Make-ICU-test-output-compatible-with-Automake-format.patch index ab88803b36a..af75261f7a7 100644 --- a/meta/recipes-support/icu/icu/0001-Make-ICU-test-output-compatible-with-Automake-format.patch +++ b/meta/recipes-support/icu/icu/0001-Make-ICU-test-output-compatible-with-Automake-format.patch @@ -1,4 +1,4 @@ -From 4779f798463d673dd74623979ec93141eb60d07a Mon Sep 17 00:00:00 2001 +From b315f37fd8c588632bcf01c43a191ab56a08fbed Mon Sep 17 00:00:00 2001 From: Jiaying Song Date: Fri, 21 Nov 2025 10:47:59 +0800 Subject: [PATCH] Make ICU test output compatible with Automake format @@ -22,7 +22,7 @@ Signed-off-by: Jiaying Song 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index da4f170..514fa0c 100644 +index ec84aae..7e036e1 100644 --- a/configure.ac +++ b/configure.ac @@ -1103,6 +1103,21 @@ If set, it will REPLACE any automatic list of libraries.], @@ -54,10 +54,10 @@ index da4f170..514fa0c 100644 + + diff --git a/test/intltest/intltest.cpp b/test/intltest/intltest.cpp -index 33829b0..bf3ef56 100644 +index f09da7b..9909266 100644 --- a/test/intltest/intltest.cpp +++ b/test/intltest/intltest.cpp -@@ -824,11 +824,19 @@ UBool IntlTest::runTestLoop( char* testname, char* par, char *baseName ) +@@ -828,11 +828,19 @@ UBool IntlTest::runTestLoop( char* testname, char* par, char *baseName ) saveBaseLoc[0]=0; /* reset path */ if (lastErrorCount == errorCount) { @@ -100,6 +100,3 @@ index 7634526..c2e11dd 100644 if(!ON_LINE) { /* had some output */ int spaces = FLAG_INDENT-(depth-1); log_testinfo_i("} %*s[OK] ", spaces, "---"); --- -2.34.1 - diff --git a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch index a25285fb541..f222045cf81 100644 --- a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch +++ b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch @@ -1,4 +1,4 @@ -From cf55c077b77b7a219502364eaadf12c074ab005e Mon Sep 17 00:00:00 2001 +From 0b3d2340ca2a88aeaa41dd2363584ee42930c42b Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Wed, 8 May 2019 14:42:30 +0900 Subject: [PATCH] icu: Added armeb support. diff --git a/meta/recipes-support/icu/icu/0001-test-Add-support-ptest.patch b/meta/recipes-support/icu/icu/0001-test-Add-support-ptest.patch index d9fd8e3e43c..9947a74008f 100644 --- a/meta/recipes-support/icu/icu/0001-test-Add-support-ptest.patch +++ b/meta/recipes-support/icu/icu/0001-test-Add-support-ptest.patch @@ -1,18 +1,21 @@ -From 783d9e0d3d7824fbca53c2c3a80e8e5e23eacc82 Mon Sep 17 00:00:00 2001 +From c3ce4ce9b23ec8e6f0966bca8edef6cf937bdc7b Mon Sep 17 00:00:00 2001 From: Daisuke Yamane Date: Tue, 1 Jul 2025 18:35:25 +0900 Subject: [PATCH] test: Add support ptest Upstream-Status: Inappropriate [oe-core specific] +Note: Updated for 79.1 - dropped the intltest.cpp hunk since upstream +removed that code, kept the four Makefile.in changes. + Signed-off-by: Daisuke Yamane +Signed-off-by: Jaipaul Cheernam --- - test/cintltst/Makefile.in | 2 +- - test/intltest/Makefile.in | 2 +- - test/intltest/intltest.cpp | 2 +- - test/iotest/Makefile.in | 2 +- - test/letest/Makefile.in | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) + test/cintltst/Makefile.in | 2 +- + test/intltest/Makefile.in | 2 +- + test/iotest/Makefile.in | 2 +- + test/letest/Makefile.in | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cintltst/Makefile.in b/test/cintltst/Makefile.in index 552a105..9cf3071 100644 @@ -28,7 +31,7 @@ index 552a105..9cf3071 100644 LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) diff --git a/test/intltest/Makefile.in b/test/intltest/Makefile.in -index 5d4a03b..ca4e4cd 100644 +index 2e44831..d5bd240 100644 --- a/test/intltest/Makefile.in +++ b/test/intltest/Makefile.in @@ -39,7 +39,7 @@ CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT= @@ -40,19 +43,6 @@ index 5d4a03b..ca4e4cd 100644 endif LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(LIB_THREAD) -diff --git a/test/intltest/intltest.cpp b/test/intltest/intltest.cpp -index 3806d0f..33829b0 100644 ---- a/test/intltest/intltest.cpp -+++ b/test/intltest/intltest.cpp -@@ -1707,7 +1707,7 @@ static bool fileExists(const char* fileName) { - * Returns the path to icu/testdata/ - */ - const char *IntlTest::getSharedTestData(UErrorCode& err) { --#define SOURCE_TARBALL_TOP U_TOPSRCDIR U_FILE_SEP_STRING ".." U_FILE_SEP_STRING -+#define SOURCE_TARBALL_TOP U_TOPSRCDIR U_FILE_SEP_STRING - #define REPO_TOP SOURCE_TARBALL_TOP ".." U_FILE_SEP_STRING - #define FILE_NAME U_FILE_SEP_STRING "message2" U_FILE_SEP_STRING "valid-tests.json" - const char *srcDataDir = nullptr; diff --git a/test/iotest/Makefile.in b/test/iotest/Makefile.in index 16c510f..9eeff4b 100644 --- a/test/iotest/Makefile.in @@ -79,6 +69,3 @@ index 156c86f..555a820 100644 LIBS = $(LIBICULX) $(LIBICUUC) $(LIBICUI18N) $(LIBCTESTFW) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(ICULEHB_LIBS) COMMONOBJECTS = SimpleFontInstance.o --- -2.43.0 - diff --git a/meta/recipes-support/icu/icu/mangle-build-tmp.patch b/meta/recipes-support/icu/icu/mangle-build-tmp.patch index cf24e53b886..a2bce61c72c 100644 --- a/meta/recipes-support/icu/icu/mangle-build-tmp.patch +++ b/meta/recipes-support/icu/icu/mangle-build-tmp.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a729216a3fbc4d9eda9cbacd8b8dc6670c797978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Sommer?= Date: Sat, 28 Mar 2026 20:29:53 +0100 Subject: [PATCH] test/udatatst: Mangle /build/tmp @@ -8,12 +8,11 @@ Content-Transfer-Encoding: 8bit This string matches $TMPDIR (in a kas-container) which triggers the QA check buildpaths: -ERROR: icu-78.2-r0 do_package_qa: QA Issue: File /usr/src/debug/icu/78.2/test/cintltst/udatatst.c in package icu-src contains reference to TMPDIR [buildpaths] +ERROR: icu-78.2-r0 do_package_qa: QA Issue: File /usr/src/debug/icu/78.2/test/cintltst/udatatst.c in package icu-src contains reference to TMPDIR [buildpaths] Signed-off-by: Jörg Sommer ---- Upstream-Status: Inappropriate [This QA check collision of Yocto specific] - +--- test/cintltst/udatatst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/icu/icu_78.3.bb b/meta/recipes-support/icu/icu_79.1.bb similarity index 95% rename from meta/recipes-support/icu/icu_78.3.bb rename to meta/recipes-support/icu/icu_79.1.bb index c057505e3cc..a920c7f2e12 100644 --- a/meta/recipes-support/icu/icu_78.3.bb +++ b/meta/recipes-support/icu/icu_79.1.bb @@ -92,7 +92,7 @@ FILES:libicuio = "${libdir}/libicuio.so.*" BBCLASSEXTEND = "native nativesdk" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=e531a388be7c1df9a0fb7b4010c9c1d7" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=b2329a1b467abf456a6eb531b5000855" ICU_PV = "${PV}" ICU_FOLDER = "${PV}" @@ -117,8 +117,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ SRC_URI:append:class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[code.sha256sum] = "3a2e7a47604ba702f345878308e6fefeca612ee895cf4a5f222e7955fabfe0c0" -SRC_URI[data.sha256sum] = "9d8b3899096aeb83e4e21ef8a40fec9e03b28db18c48452efac882ce25a91e27" +SRC_URI[code.sha256sum] = "06fa63ecb521048f8082f12ad988f6b678d90cbd88aafce24cbc94902b191d99" +SRC_URI[data.sha256sum] = "b3a430009bb5fab77b1a4b98fab85cc8f887e26d4e4166121724298ae14d7224" UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P(?!.+rc).+)" GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" @@ -167,7 +167,6 @@ do_install_ptest() { cp -r ${S}/test/testdata ${D}/${PTEST_PATH}/test cp -r ${S}/data/unidata ${D}/${PTEST_PATH}/data/ cp -r ${S}/data/sprep ${D}/${PTEST_PATH}/data/ - cp -r ${S}/../testdata ${D}/${PTEST_PATH}/ cp -r ${B}/test/testdata/out ${D}/${PTEST_PATH}/test/testdata install -d ${D}${PTEST_PATH}/test/tests