summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/conf/include/ptest-packagelists-meta-oe.inc1
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb-native_11.4.9.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb-native_11.4.8.bb)0
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc3
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch41
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb_11.4.9.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb_11.4.8.bb)0
-rw-r--r--meta-oe/recipes-devtools/php/php_8.4.15.bb (renamed from meta-oe/recipes-devtools/php/php_8.4.14.bb)2
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch32
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch8
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch18
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch42
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_8.2510.0.bb (renamed from meta-oe/recipes-extended/rsyslog/rsyslog_8.2506.0.bb)6
-rw-r--r--meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb2
-rw-r--r--meta-oe/recipes-support/exiv2/exiv2/0001-Allow-test-data-path-configuration.patch30
-rw-r--r--meta-oe/recipes-support/exiv2/exiv2/0001-Use-automake-output-for-tests.patch35
-rw-r--r--meta-oe/recipes-support/exiv2/exiv2/run-ptest6
-rw-r--r--meta-oe/recipes-support/exiv2/exiv2_0.28.7.bb31
-rw-r--r--meta-oe/recipes-support/gsoap/gsoap_2.8.137.bb (renamed from meta-oe/recipes-support/gsoap/gsoap_2.8.135.bb)2
17 files changed, 122 insertions, 137 deletions
diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
index ea336f1058..0473b60504 100644
--- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
+++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
@@ -13,6 +13,7 @@ PTESTS_FAST_META_OE = "\
13 cmocka \ 13 cmocka \
14 cunit \ 14 cunit \
15 duktape \ 15 duktape \
16 exiv2 \
16 fuse3 \ 17 fuse3 \
17 function2 \ 18 function2 \
18 fwupd \ 19 fwupd \
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.8.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.9.bb
index ff48dcd806..ff48dcd806 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.8.bb
+++ b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.9.bb
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 82479c248f..4fcb5a1e40 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -22,14 +22,13 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
22 file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ 22 file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
23 file://lfs64.patch \ 23 file://lfs64.patch \
24 file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ 24 file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
25 file://0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch \
26 file://riscv32.patch \ 25 file://riscv32.patch \
27 file://0001-Remove-x86-specific-loop-in-my_convert.patch \ 26 file://0001-Remove-x86-specific-loop-in-my_convert.patch \
28 file://0001-support-reproducible-builds.patch \ 27 file://0001-support-reproducible-builds.patch \
29 file://0001-storage-mroonga-CMakeLists.txt-fix-reproducible-buil.patch \ 28 file://0001-storage-mroonga-CMakeLists.txt-fix-reproducible-buil.patch \
30 file://0001-MDEV-38029-my_tzinfo-t-fails-for-certain-TZ-values-o.patch \ 29 file://0001-MDEV-38029-my_tzinfo-t-fails-for-certain-TZ-values-o.patch \
31 " 30 "
32SRC_URI[sha256sum] = "52fa4dca2c5f80afc1667d523a27c06176d98532298a6b0c31ed73505f49e15c" 31SRC_URI[sha256sum] = "8e481ca29b5a740444d45451c8ea2d93711cf525d6fa5d27bc9512cf8973b075"
33 32
34UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags" 33UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags"
35 34
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch
deleted file mode 100644
index 2a1c74a68c..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 0b1ba174bd5148c0675b335fcebde767a56e10bb Mon Sep 17 00:00:00 2001
2From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
3Date: Mon, 2 Dec 2024 02:18:46 +0000
4Subject: [PATCH] Ensure compatibility with ARMv9 by updating .arch directive
5
6The pmem_cvap() function currently uses the '.arch armv8.2-a' directive
7for the 'dc cvap' instruction. This will cause build errors below when
8compiling for ARMv9 systems. Update the '.arch' directive to 'armv9.4-a'
9to ensure compatibility with ARMv9 architectures.
10
11{standard input}: Assembler messages:
12{standard input}:169: Error: selected processor does not support `retaa'
13{standard input}:286: Error: selected processor does not support `retaa'
14make[2]: *** [storage/innobase/CMakeFiles/innobase_embedded.dir/build.make:
151644: storage/innobase/CMakeFiles/innobase_embedded.dir/sync/cache.cc.o]
16Error 1
17
18Upstream-Status: Submitted
19
20Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
21---
22 storage/innobase/sync/cache.cc | 5 +++++
23 1 file changed, 5 insertions(+)
24
25diff --git a/storage/innobase/sync/cache.cc b/storage/innobase/sync/cache.cc
26index 43d642d0..c5e67709 100644
27--- a/storage/innobase/sync/cache.cc
28+++ b/storage/innobase/sync/cache.cc
29@@ -82,7 +82,12 @@ static void pmem_cvap(const void* buf, size_t size)
30 for (uintptr_t u= uintptr_t(buf) & ~(CPU_LEVEL1_DCACHE_LINESIZE),
31 end= uintptr_t(buf) + size;
32 u < end; u+= CPU_LEVEL1_DCACHE_LINESIZE)
33+#if defined __ARM_ARCH && __ARM_ARCH == 9
34+ __asm__ __volatile__(".arch armv9.4-a\n dc cvap, %0" :: "r"(u) : "memory");
35+#else
36 __asm__ __volatile__(".arch armv8.2-a\n dc cvap, %0" :: "r"(u) : "memory");
37+#endif
38+
39 __asm__ __volatile__("dmb ishst" ::: "memory");
40 }
41
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_11.4.8.bb b/meta-oe/recipes-dbs/mysql/mariadb_11.4.9.bb
index b1d1355e2b..b1d1355e2b 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb_11.4.8.bb
+++ b/meta-oe/recipes-dbs/mysql/mariadb_11.4.9.bb
diff --git a/meta-oe/recipes-devtools/php/php_8.4.14.bb b/meta-oe/recipes-devtools/php/php_8.4.15.bb
index 086e7114fb..629eef0519 100644
--- a/meta-oe/recipes-devtools/php/php_8.4.14.bb
+++ b/meta-oe/recipes-devtools/php/php_8.4.15.bb
@@ -32,7 +32,7 @@ UPSTREAM_CHECK_REGEX = "releases/tag/php-(?P<pver>\d+(\.\d+)+)"
32 32
33S = "${UNPACKDIR}/php-${PV}" 33S = "${UNPACKDIR}/php-${PV}"
34 34
35SRC_URI[sha256sum] = "f2139ce4cb7a6c5643ee98caa34e5c32ba841c2ba293e34a3d0357faa84bb3e7" 35SRC_URI[sha256sum] = "b7155bdd498d60d63e4bc320dc224863976d31b5bd9339699726c961255a3197"
36 36
37CVE_STATUS_GROUPS += "CVE_STATUS_PHP" 37CVE_STATUS_GROUPS += "CVE_STATUS_PHP"
38CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." 38CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored."
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch
deleted file mode 100644
index 6ce8b7a9c8..0000000000
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 7baf35b88d742032a2dc456c396843e17e866f8e Mon Sep 17 00:00:00 2001
2From: Ming Liu <peter.x.liu@external.atlascopco.com>
3Date: Wed, 27 Jun 2018 14:04:57 +0800
4Subject: [PATCH] Include sys/time.h
5
6struct timeval is defined in sys/time.h with a musl libc.
7
8Upstream-Status: Inappropriate [musl libc specific]
9
10Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
11Signed-off-by: Changqing Li <changqing.li@windriver.com>
12---
13 tests/msleep.c | 4 ----
14 1 file changed, 4 deletions(-)
15
16diff --git a/tests/msleep.c b/tests/msleep.c
17index 98dbece..96f6950 100644
18--- a/tests/msleep.c
19+++ b/tests/msleep.c
20@@ -26,11 +26,7 @@
21 #include "config.h"
22 #include <stdio.h>
23 #include <stdlib.h>
24-#if defined(__FreeBSD__)
25 #include <sys/time.h>
26-#else
27-#include <time.h>
28-#endif
29 #if defined(HAVE_SYS_SELECT_H)
30 #include <sys/select.h>
31 #endif
322.7.4
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
index a506b7a6dc..728cdace0c 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
@@ -23,19 +23,19 @@ diff --git a/tests/diag.sh b/tests/diag.sh
23index a9c2a75..0b017c5 100755 23index a9c2a75..0b017c5 100755
24--- a/tests/diag.sh 24--- a/tests/diag.sh
25+++ b/tests/diag.sh 25+++ b/tests/diag.sh
26@@ -2979,7 +2979,7 @@ case $1 in 26@@ -3683,7 +3683,7 @@
27 fi 27 fi
28 ;; 28 ;;
29 'check-inotify') # Check for inotify/fen support 29 'check-inotify') # Check for inotify/fen support
30- if [ -n "$(find /usr/include -name 'inotify.h' -print -quit)" ]; then 30- if [ -n "$(find /usr/include -name 'inotify.h' -print -quit)" ]; then
31+ if true; then 31+ if true; then
32 echo [inotify mode] 32 echo [inotify mode]
33 elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then 33 elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then
34 grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h 34 grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h
35@@ -2994,7 +2994,7 @@ case $1 in 35@@ -3698,7 +3698,7 @@
36 fi 36 fi
37 ;; 37 ;;
38 'check-inotify-only') # Check for ONLY inotify support 38 'check-inotify-only') # Check for ONLY inotify support
39- if [ -n "$(find /usr/include -name 'inotify.h' -print -quit)" ]; then 39- if [ -n "$(find /usr/include -name 'inotify.h' -print -quit)" ]; then
40+ if true; then 40+ if true; then
41 echo [inotify mode] 41 echo [inotify mode]
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
index 884086bfc3..76749877b6 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
@@ -21,12 +21,12 @@ diff --git a/tests/tcpflood.c b/tests/tcpflood.c
21index 5e6f13a..09cedbb 100644 21index 5e6f13a..09cedbb 100644
22--- a/tests/tcpflood.c 22--- a/tests/tcpflood.c
23+++ b/tests/tcpflood.c 23+++ b/tests/tcpflood.c
24@@ -836,7 +836,7 @@ int sendMessages(struct instdata *inst) 24@@ -865,7 +865,7 @@
25 } 25 }
26 lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number); 26 lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number);
27 } else if(transport == TP_UDP) { 27 } else if (transport == TP_UDP) {
28- lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr)); 28- lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr));
29+ lenSend = sendto(udpsockout, buf, lenBuf, 0, (const struct sockaddr *)&udpRcvr, sizeof(udpRcvr)); 29+ lenSend = sendto(udpsockout, buf, lenBuf, 0, (const struct sockaddr *)&udpRcvr, sizeof(udpRcvr));
30 error_number = errno; 30 error_number = errno;
31 } else if(transport == TP_TLS) { 31 } else if (transport == TP_TLS) {
32 if(sockArray[socknum] == -1) { 32 if (sockArray[socknum] == -1) {
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
deleted file mode 100644
index f5ae65fb58..0000000000
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From d2dd13d930c91e45417c7361908f0af75e0e6c00 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com>
3Date: Wed, 18 Jun 2014 13:46:52 +0800
4Subject: [PATCH] use pkgconfig to check libgcrypt
5
6Upstream-Status: Inappropriate [configuration]
7
8libgcrypt does no longer provide libgcrypt-config, and provide
9*.pc, so we should use pkgconfig to check
10
11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
13---
14 configure.ac | 15 +--------------
15 1 file changed, 1 insertion(+), 14 deletions(-)
16
17diff --git a/configure.ac b/configure.ac
18index f8c0ac8..794bfb3 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -1217,20 +1217,7 @@ AC_ARG_ENABLE(libgcrypt,
22 [enable_libgcrypt=yes]
23 )
24 if test "x$enable_libgcrypt" = "xyes"; then
25- AC_PATH_PROG([LIBGCRYPT_CONFIG],[libgcrypt-config],[no])
26- if test "x${LIBGCRYPT_CONFIG}" = "xno"; then
27- AC_MSG_FAILURE([libgcrypt-config not found in PATH])
28- fi
29- AC_CHECK_LIB(
30- [gcrypt],
31- [gcry_cipher_open],
32- [LIBGCRYPT_CFLAGS="`${LIBGCRYPT_CONFIG} --cflags`"
33- LIBGCRYPT_LIBS="`${LIBGCRYPT_CONFIG} --libs`"
34- ],
35- [AC_MSG_FAILURE([libgcrypt is missing])],
36- [`${LIBGCRYPT_CONFIG} --libs --cflags`]
37- )
38- AC_DEFINE([ENABLE_LIBGCRYPT], [1], [Indicator that LIBGCRYPT is present])
39+ PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt)
40 fi
41 AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes)
42 AM_CONDITIONAL(ENABLE_RSCRYUTIL, test x$enable_libgcrypt = xyes || test x$enable_openssl_crypto_provider = xyes)
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2506.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2510.0.bb
index bcac76a231..c92c11d8f3 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2506.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2510.0.bb
@@ -22,17 +22,15 @@ SRC_URI = "https://www.rsyslog.com/files/download/rsyslog/${BPN}-${PV}.tar.gz \
22 file://rsyslog.conf \ 22 file://rsyslog.conf \
23 file://rsyslog.logrotate \ 23 file://rsyslog.logrotate \
24 file://rsyslog.service \ 24 file://rsyslog.service \
25 file://use-pkgconfig-to-check-libgcrypt.patch \
26 file://run-ptest \ 25 file://run-ptest \
27 file://0001-tests-disable-the-check-for-inotify.patch \ 26 file://0001-tests-disable-the-check-for-inotify.patch \
28 file://0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch \ 27 file://0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch \
29" 28"
30 29
31SRC_URI:append:libc-musl = " \ 30SRC_URI:append:libc-musl = " \
32 file://0001-Include-sys-time-h.patch \
33 file://disable-omfile-outchannel.patch \ 31 file://disable-omfile-outchannel.patch \
34" 32"
35SRC_URI[sha256sum] = "6d6fd0257c95e756765d4d585a833d54dd3a0e5eeb8308b862a81b368a74bb7b" 33SRC_URI[sha256sum] = "a70a9834186859539a6a4d1c7b3f68c23897e805829b764a45e92cb0cc95e66a"
36 34
37UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags" 35UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags"
38UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" 36UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
@@ -92,6 +90,8 @@ TESTDIR = "tests"
92do_compile_ptest() { 90do_compile_ptest() {
93 echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile 91 echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile
94 oe_runmake -C ${TESTDIR} buildtest-TESTS 92 oe_runmake -C ${TESTDIR} buildtest-TESTS
93 # buildpaths: remove .deps/*, an unneeded compile dependency automake artifact.
94 rm -rf ${B}/${TESTDIR}/.deps
95} 95}
96 96
97do_install_ptest() { 97do_install_ptest() {
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
index dd4f79c314..d3159f8a88 100644
--- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
+++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
@@ -85,3 +85,5 @@ FILES:${PN} += " \
85" 85"
86 86
87SYSTEMD_SERVICE:${PN} = "vncserver@.service" 87SYSTEMD_SERVICE:${PN} = "vncserver@.service"
88
89CVE_STATUS[2014-8241] = "fixed-version: The vulnerable code is not present in the used version (1.15.0)"
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0001-Allow-test-data-path-configuration.patch b/meta-oe/recipes-support/exiv2/exiv2/0001-Allow-test-data-path-configuration.patch
new file mode 100644
index 0000000000..a5345733fb
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0001-Allow-test-data-path-configuration.patch
@@ -0,0 +1,30 @@
1From 2483e51df6e02ad0ad5ae636767279fa230da44f Mon Sep 17 00:00:00 2001
2From: Gyorgy Sarvari <skandigraun@gmail.com>
3Date: Sun, 23 Nov 2025 11:52:24 +0100
4Subject: [PATCH] Allow test data path configuration
5
6The unittests expect to the executed in the source folder before/after build,
7and they expect the test data to be in the source folder. However for ptests
8these folders are not available.
9
10This patch allows the test data folders to be configuration during build time.
11
12Upstream-Status: Inappropriate [ptest-specific]
13Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
14---
15 unitTests/CMakeLists.txt | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/unitTests/CMakeLists.txt b/unitTests/CMakeLists.txt
19index 51040c0e2..e2604d4a7 100644
20--- a/unitTests/CMakeLists.txt
21+++ b/unitTests/CMakeLists.txt
22@@ -42,7 +42,7 @@ add_executable(unit_tests
23 target_compile_definitions(unit_tests
24 PRIVATE
25 exiv2lib_STATIC
26- TESTDATA_PATH="${PROJECT_SOURCE_DIR}/test/data"
27+ TESTDATA_PATH="${TEST_FOLDER}/test/data"
28 )
29
30 target_link_libraries(unit_tests
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0001-Use-automake-output-for-tests.patch b/meta-oe/recipes-support/exiv2/exiv2/0001-Use-automake-output-for-tests.patch
new file mode 100644
index 0000000000..6514ac07a3
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0001-Use-automake-output-for-tests.patch
@@ -0,0 +1,35 @@
1From 09e5f783b3d1dcb7db6e975e9662c8401a614539 Mon Sep 17 00:00:00 2001
2From: Gyorgy Sarvari <skandigraun@gmail.com>
3Date: Sun, 23 Nov 2025 11:35:50 +0100
4Subject: [PATCH] Use automake output for tests
5
6Convert the Python unittest output to automake output so ptest can
7ingest it.
8
9Upstream-Status: Inappropriate [oe-specific]
10Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
11---
12 tests/runner.py | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15diff --git a/tests/runner.py b/tests/runner.py
16index adebf83ba..9800cf971 100755
17--- a/tests/runner.py
18+++ b/tests/runner.py
19@@ -4,6 +4,7 @@
20 import argparse
21 import functools
22 import os
23+import putao.unittest
24 import sys
25 import unittest
26 from fnmatch import fnmatchcase
27@@ -93,7 +94,7 @@ if __name__ == '__main__':
28 DEFAULT_ROOT
29 )
30
31- test_res = unittest.runner.TextTestRunner(verbosity=args.verbose)\
32+ test_res = putao.unittest.TestRunner()\
33 .run(discovered_tests)
34
35 sys.exit(0 if len(test_res.failures) + len(test_res.errors) == 0 else 1)
diff --git a/meta-oe/recipes-support/exiv2/exiv2/run-ptest b/meta-oe/recipes-support/exiv2/exiv2/run-ptest
new file mode 100644
index 0000000000..6c50a12fc1
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/run-ptest
@@ -0,0 +1,6 @@
1#!/bin/sh
2cd tests
3python3 ./runner.py
4
5cd ..
6./build/bin/unit_tests --gtest_print_time=0 | sed -E '/^\[ RUN/d ; s/\[ OK \]/PASS: / ; s/\[ DISABLED \]/SKIP: / ; s/\[ FAILED \]/FAIL: /'
diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.7.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.7.bb
index e1f57ae8c7..82ee232fdc 100644
--- a/meta-oe/recipes-support/exiv2/exiv2_0.28.7.bb
+++ b/meta-oe/recipes-support/exiv2/exiv2_0.28.7.bb
@@ -4,7 +4,34 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2"
4 4
5DEPENDS = "zlib expat brotli libinih" 5DEPENDS = "zlib expat brotli libinih"
6 6
7SRC_URI = "git://github.com/Exiv2/exiv2.git;protocol=https;branch=0.28.x;tag=v${PV}" 7SRC_URI = "git://github.com/Exiv2/exiv2.git;protocol=https;branch=0.28.x;tag=v${PV} \
8 file://run-ptest \
9 file://0001-Use-automake-output-for-tests.patch \
10 file://0001-Allow-test-data-path-configuration.patch \
11 "
8SRCREV = "afcb7a8ba84a7de36d2f1ee7689394e078697956" 12SRCREV = "afcb7a8ba84a7de36d2f1ee7689394e078697956"
9 13
10inherit cmake gettext 14inherit cmake gettext ptest
15
16PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'test unittest', '', d)}"
17PACKAGECONFIG[test] = "-DEXIV2_BUILD_SAMPLES=ON -DEXIV2_ENABLE_WEBREADY=ON"
18PACKAGECONFIG[unittest] = "-DEXIV2_BUILD_UNIT_TESTS=ON -DTEST_FOLDER=${PTEST_PATH},,googletest"
19
20RDEPENDS:${PN}-ptest += " \
21 python3-html \
22 python3-lxml \
23 python3-multiprocessing \
24 python3-shell \
25 python3-unittest \
26 python3-unittest-automake-output"
27
28do_install_ptest(){
29 cp -r ${S}/tests ${D}${PTEST_PATH}/
30 cp -r ${S}/test ${D}${PTEST_PATH}/
31
32 install -d ${D}${PTEST_PATH}/build/bin
33 install ${B}/bin/* ${D}${PTEST_PATH}/build/bin
34
35 install -d ${D}${PTEST_PATH}/src
36 install ${S}/src/canonmn_int.cpp ${D}${PTEST_PATH}/src
37}
diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.135.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.137.bb
index 8ce4f17075..b91187c13f 100644
--- a/meta-oe/recipes-support/gsoap/gsoap_2.8.135.bb
+++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.137.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7eaf5d4df67c0db38549ba3c714a37d6 \
7 7
8SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip \ 8SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip \
9 file://0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch" 9 file://0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch"
10SRC_URI[sha256sum] = "b11757e405d55d4674dfbf88c4fa6d7e24155cf64ed8ed578ccad2f2b555e98d" 10SRC_URI[sha256sum] = "a6c9fb9088efd60ad0e983fa83d8440fe128514db22297b5b3f2de302106e55c"
11 11
12inherit autotools 12inherit autotools
13 13
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-25 17:07:21 +0000