diff options
35 files changed, 370 insertions, 213 deletions
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.4.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb index 07ac602d12..e6dfe43092 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.4.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb | |||
| @@ -26,7 +26,7 @@ SRC_URI = "gitsm://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls | |||
| 26 | file://run-ptest \ | 26 | file://run-ptest \ |
| 27 | " | 27 | " |
| 28 | 28 | ||
| 29 | SRCREV = "c765c831e5c2a0971410692f92f7a81d6ec65ec2" | 29 | SRCREV = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df" |
| 30 | 30 | ||
| 31 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 31 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |
| 32 | 32 | ||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch index 0ddcb642bc..ffbe4e6744 100644 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 2f931baf290477b586309189445bf87e3bc5d5ba Mon Sep 17 00:00:00 2001 | 1 | From 0be97662524d86a24647f7c37b0a66b18da7b72c Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | 2 | From: Yi Zhao <yi.zhao@windriver.com> |
| 3 | Date: Wed, 2 Mar 2022 14:51:13 +0800 | 3 | Date: Wed, 2 Mar 2022 14:51:13 +0800 |
| 4 | Subject: [PATCH] Fix pkgconfig dir for multilib | 4 | Subject: [PATCH] Fix pkgconfig dir for multilib |
| @@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 12 | 12 | ||
| 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 14 | index ab399a69..beae6eaf 100644 | 14 | index 8445ecc8..12c3b947 100644 |
| 15 | --- a/CMakeLists.txt | 15 | --- a/CMakeLists.txt |
| 16 | +++ b/CMakeLists.txt | 16 | +++ b/CMakeLists.txt |
| 17 | @@ -637,7 +637,7 @@ endif() | 17 | @@ -661,7 +661,7 @@ endif() |
| 18 | # create pkg-config file | 18 | # create pkg-config file |
| 19 | if(NOT WIN32) | 19 | if(NOT WIN32) |
| 20 | configure_file(${VSOMEIP_NAME}.pc.in ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc @ONLY) | 20 | configure_file(${VSOMEIP_NAME}.pc.in ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc @ONLY) |
| @@ -24,5 +24,5 @@ index ab399a69..beae6eaf 100644 | |||
| 24 | 24 | ||
| 25 | ############################################################################## | 25 | ############################################################################## |
| 26 | -- | 26 | -- |
| 27 | 2.25.1 | 27 | 2.34.1 |
| 28 | 28 | ||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch index bdaf343606..6dd854e94e 100644 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From ebaa3206ee125741314272cddafa04fa71bd2d1e Mon Sep 17 00:00:00 2001 | 1 | From c9d03f6b100d1be8bee75caf933e10fcbb599db3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | 2 | From: Yi Zhao <yi.zhao@windriver.com> |
| 3 | Date: Wed, 9 Mar 2022 11:48:44 +0800 | 3 | Date: Wed, 9 Mar 2022 11:48:44 +0800 |
| 4 | Subject: [PATCH] Install example configuration files to /etc/vsomeip | 4 | Subject: [PATCH] Install example configuration files to /etc/vsomeip |
| @@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 12 | 12 | ||
| 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 14 | index beae6eaf..d791c12e 100644 | 14 | index 12c3b947..b42f8688 100644 |
| 15 | --- a/CMakeLists.txt | 15 | --- a/CMakeLists.txt |
| 16 | +++ b/CMakeLists.txt | 16 | +++ b/CMakeLists.txt |
| 17 | @@ -536,7 +536,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION lib/pkgconfig) | 17 | @@ -578,7 +578,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION lib/pkgconfig) |
| 18 | endif () | 18 | endif () |
| 19 | 19 | ||
| 20 | install ( | 20 | install ( |
| @@ -24,5 +24,5 @@ index beae6eaf..d791c12e 100644 | |||
| 24 | 24 | ||
| 25 | # Add all targets to the build-tree export set | 25 | # Add all targets to the build-tree export set |
| 26 | -- | 26 | -- |
| 27 | 2.25.1 | 27 | 2.34.1 |
| 28 | 28 | ||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-specify-PIE-flag-explicitly.patch index 2d789627a3..cada06e98e 100644 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-specify-PIE-flag-explicitly.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From ec2d36466c9050ee282ea1c3bb1b5f1f61c96ecb Mon Sep 17 00:00:00 2001 | 1 | From 8054f459d47cde818ed9d1eb1e49efb4a8d4b3df Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | 2 | From: Yi Zhao <yi.zhao@windriver.com> |
| 3 | Date: Mon, 17 Jul 2023 14:33:32 +0800 | 3 | Date: Mon, 17 Jul 2023 14:33:32 +0800 |
| 4 | Subject: [PATCH] Do not specify PIE flag explicitly | 4 | Subject: [PATCH] Do not specify PIE flag explicitly |
| @@ -23,9 +23,11 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
| 23 | CMakeLists.txt | 4 ++-- | 23 | CMakeLists.txt | 4 ++-- |
| 24 | 1 file changed, 2 insertions(+), 2 deletions(-) | 24 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 25 | 25 | ||
| 26 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 27 | index b42f8688..c39184e9 100644 | ||
| 26 | --- a/CMakeLists.txt | 28 | --- a/CMakeLists.txt |
| 27 | +++ b/CMakeLists.txt | 29 | +++ b/CMakeLists.txt |
| 28 | @@ -70,7 +70,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" | 30 | @@ -73,7 +73,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
| 29 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | 31 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") |
| 30 | # This is only relevant for GCC and causes warnings on Clang | 32 | # This is only relevant for GCC and causes warnings on Clang |
| 31 | set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc") | 33 | set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc") |
| @@ -34,12 +36,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
| 34 | endif() | 36 | endif() |
| 35 | 37 | ||
| 36 | set(NO_DEPRECATED "") | 38 | set(NO_DEPRECATED "") |
| 37 | @@ -78,7 +78,7 @@ endif() | 39 | @@ -82,7 +82,7 @@ endif() |
| 38 | if(NOT DEFINED _FORTIFY_SOURCE) | 40 | if(NOT DEFINED _FORTIFY_SOURCE) |
| 39 | set(_FORTIFY_SOURCE 2) | 41 | set(_FORTIFY_SOURCE 2) |
| 40 | endif() | 42 | endif() |
| 41 | - set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -fPIE") | 43 | - set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -fPIE -Wno-inconsistent-missing-override") |
| 42 | + set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic") | 44 | + set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -Wno-inconsistent-missing-override") |
| 43 | 45 | ||
| 44 | # force all use of std::mutex and std::recursive_mutex to use runtime init | 46 | # force all use of std::mutex and std::recursive_mutex to use runtime init |
| 45 | # instead of static initialization so mutexes can be hooked to enable PI as needed | 47 | # instead of static initialization so mutexes can be hooked to enable PI as needed |
| 48 | -- | ||
| 49 | 2.34.1 | ||
| 50 | |||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-build-with-boost-1.89.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-build-with-boost-1.89.patch new file mode 100644 index 0000000000..45fffa733f --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-build-with-boost-1.89.patch | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | From 2a5c3fbfd863a69eafce6a13b273f5c17cbf4062 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Mon, 3 Nov 2025 23:06:35 +0800 | ||
| 4 | Subject: [PATCH] Fix build with boost 1.89 | ||
| 5 | |||
| 6 | The Boost.System stub library has been removed in Boost 1.89.0[1], which | ||
| 7 | causes a CMake error: | ||
| 8 | |||
| 9 | CMake Error at Boost-1.89.0/BoostConfig.cmake:141 (find_package): | ||
| 10 | Could not find a package configuration file provided by "boost_system" | ||
| 11 | (requested version 1.89.0) with any of the following names: | ||
| 12 | boost_systemConfig.cmake | ||
| 13 | boost_system-config.cmake | ||
| 14 | |||
| 15 | Drop 'system' from the COMPONENTS in find_package to fix this issue[2]. | ||
| 16 | |||
| 17 | [1] https://github.com/boostorg/system/commit/7a495bb46d7ccd808e4be2a6589260839b0fd3a3 | ||
| 18 | [2] https://github.com/boostorg/system/issues/132 | ||
| 19 | |||
| 20 | Upstream-Status: Pending | ||
| 21 | |||
| 22 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 23 | --- | ||
| 24 | CMakeLists.txt | 2 +- | ||
| 25 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 26 | |||
| 27 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 28 | index c39184e9..ddc1eed8 100644 | ||
| 29 | --- a/CMakeLists.txt | ||
| 30 | +++ b/CMakeLists.txt | ||
| 31 | @@ -189,7 +189,7 @@ add_definitions(-DVSOMEIP_INTERNAL_SUPPRESS_DEPRECATED) | ||
| 32 | find_package(Threads REQUIRED) | ||
| 33 | |||
| 34 | # Boost | ||
| 35 | -find_package( Boost 1.66 COMPONENTS system thread filesystem REQUIRED ) | ||
| 36 | +find_package( Boost 1.66 COMPONENTS thread filesystem REQUIRED ) | ||
| 37 | if(${CMAKE_SYSTEM_NAME} MATCHES "QNX") | ||
| 38 | include_directories(${Boost_INCLUDE_DIR} ) | ||
| 39 | else() | ||
| 40 | -- | ||
| 41 | 2.34.1 | ||
| 42 | |||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch new file mode 100644 index 0000000000..c25df03d3b --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | From 47b976736e4f57447339081ab5a40435b3b2d5a8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Tue, 4 Nov 2025 22:10:33 +0800 | ||
| 4 | Subject: [PATCH] Replace address::from_string with make_address | ||
| 5 | |||
| 6 | boost::asio::ip::address::from_string is deprecated since boost 1.87[1]. | ||
| 7 | Replace it with make_address. | ||
| 8 | |||
| 9 | Fix: | ||
| 10 | implementation/routing/src/routing_manager_impl.cpp:1406:98: error: 'from_string' is not a member of 'boost::asio::ip::address_v4' | ||
| 11 | 1406 | _remote_address.is_v4() ? _remote_address.to_v4() : boost::asio::ip::address_v4::from_string("6.6.6.6"); | ||
| 12 | | ^~~~~~~~~~~ | ||
| 13 | |||
| 14 | [1] https://github.com/boostorg/asio/commit/c0d1cfce7767599c4cf00df36f8017a1073339ae | ||
| 15 | |||
| 16 | Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/973] | ||
| 17 | |||
| 18 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 19 | --- | ||
| 20 | implementation/routing/src/routing_manager_impl.cpp | 4 ++-- | ||
| 21 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 22 | |||
| 23 | diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp | ||
| 24 | index 3723fe5b..8a252c0b 100644 | ||
| 25 | --- a/implementation/routing/src/routing_manager_impl.cpp | ||
| 26 | +++ b/implementation/routing/src/routing_manager_impl.cpp | ||
| 27 | @@ -1404,7 +1404,7 @@ void routing_manager_impl::on_message(const byte_t* _data, length_t _size, endpo | ||
| 28 | if (is_forwarded) { | ||
| 29 | trace::header its_header; | ||
| 30 | const boost::asio::ip::address_v4 its_remote_address = | ||
| 31 | - _remote_address.is_v4() ? _remote_address.to_v4() : boost::asio::ip::address_v4::from_string("6.6.6.6"); | ||
| 32 | + _remote_address.is_v4() ? _remote_address.to_v4() : boost::asio::ip::make_address_v4("6.6.6.6"); | ||
| 33 | trace::protocol_e its_protocol = _receiver->is_local() ? trace::protocol_e::local | ||
| 34 | : _receiver->is_reliable() ? trace::protocol_e::tcp | ||
| 35 | : trace::protocol_e::udp; | ||
| 36 | @@ -1442,7 +1442,7 @@ bool routing_manager_impl::on_message(service_t _service, instance_t _instance, | ||
| 37 | std::shared_ptr<endpoint> _receiver = its_info->get_endpoint(_reliable); | ||
| 38 | if (_receiver && _receiver.get()) { | ||
| 39 | if(!is_acl_message_allowed(_receiver.get(), _service, _instance, | ||
| 40 | - boost::asio::ip::address_v4::from_string("127.0.0.1"))) { | ||
| 41 | + boost::asio::ip::make_address_v4("127.0.0.1"))) { | ||
| 42 | return false; | ||
| 43 | } | ||
| 44 | } | ||
| 45 | -- | ||
| 46 | 2.34.1 | ||
| 47 | |||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch deleted file mode 100644 index 25d66514f8..0000000000 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | From 8676ef287bb25b49668be4336387bdf83a0cae5c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Mon, 1 Jan 2024 17:02:41 +0800 | ||
| 4 | Subject: [PATCH] test/common/CMakeLists.txt: add missing link with dlt | ||
| 5 | |||
| 6 | The libvsomeip_utilities library uses functions e.g. | ||
| 7 | dlt_check_library_version/dlt_register_app/dlt_unregister_app which are | ||
| 8 | provided by dlt therefore add it to linker flags. | ||
| 9 | |||
| 10 | Fixes: | ||
| 11 | x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_check_library_version | ||
| 12 | >>> referenced by test/common/libvsomeip_utilities.so | ||
| 13 | |||
| 14 | x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_register_app | ||
| 15 | >>> referenced by test/common/libvsomeip_utilities.so | ||
| 16 | |||
| 17 | x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_unregister_app | ||
| 18 | >>> referenced by test/common/libvsomeip_utilities.so | ||
| 19 | |||
| 20 | Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/602] | ||
| 21 | |||
| 22 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 23 | --- | ||
| 24 | test/common/CMakeLists.txt | 1 + | ||
| 25 | 1 file changed, 1 insertion(+) | ||
| 26 | |||
| 27 | diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt | ||
| 28 | index d4d14534..afc8c2d6 100644 | ||
| 29 | --- a/test/common/CMakeLists.txt | ||
| 30 | +++ b/test/common/CMakeLists.txt | ||
| 31 | @@ -27,6 +27,7 @@ TARGET_LINK_LIBRARIES ( | ||
| 32 | ${Boost_LIBRARIES} | ||
| 33 | ${DL_LIBRARY} | ||
| 34 | ${TEST_LINK_LIBRARIES} | ||
| 35 | + ${DLT_LIBRARIES} | ||
| 36 | ) | ||
| 37 | |||
| 38 | # ---------------------------------------------------------------------------- | ||
| 39 | -- | ||
| 40 | 2.25.1 | ||
| 41 | |||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0006-Fix-scanning-64-bit-integer-types.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0006-Fix-scanning-64-bit-integer-types.patch new file mode 100644 index 0000000000..f4653d0010 --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0006-Fix-scanning-64-bit-integer-types.patch | |||
| @@ -0,0 +1,128 @@ | |||
| 1 | From 67878aa198e17f13a6d1a0de72bf06a872aec472 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Tue, 4 Nov 2025 12:50:51 +0800 | ||
| 4 | Subject: [PATCH] Fix scanning 64-bit integer types | ||
| 5 | |||
| 6 | Fix build error on 32-bit host: | ||
| 7 | test/network_tests/cpu_load_tests/cpu_load_measurer.cpp:89:24: error: format '%lu' expects argument of type 'long unsigned int*', | ||
| 8 | but argument 3 has type 'uint64_t*' {aka 'long long unsigned int*'} [-Werror=format=] | ||
| 9 | 89 | "%lu %lu %ld %ld", // utime, stime, cutime, cstime | ||
| 10 | | ~~^ | ||
| 11 | | | | ||
| 12 | | long unsigned int* | ||
| 13 | | %llu | ||
| 14 | 90 | &utime, &stime, &cutime, &cstime) | ||
| 15 | | ~~~~~~ | ||
| 16 | | | | ||
| 17 | | uint64_t* {aka long long unsigned int*} | ||
| 18 | |||
| 19 | Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/974] | ||
| 20 | |||
| 21 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 22 | --- | ||
| 23 | implementation/routing/src/routing_manager_impl.cpp | 4 +++- | ||
| 24 | test/network_tests/cpu_load_tests/cpu_load_measurer.cpp | 6 ++++-- | ||
| 25 | test/network_tests/memory_tests/memory_test_client.cpp | 4 +++- | ||
| 26 | test/network_tests/memory_tests/memory_test_service.cpp | 4 +++- | ||
| 27 | 4 files changed, 13 insertions(+), 5 deletions(-) | ||
| 28 | |||
| 29 | diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp | ||
| 30 | index 8a252c0b..9fb6c32c 100644 | ||
| 31 | --- a/implementation/routing/src/routing_manager_impl.cpp | ||
| 32 | +++ b/implementation/routing/src/routing_manager_impl.cpp | ||
| 33 | @@ -10,6 +10,7 @@ | ||
| 34 | #include <fstream> | ||
| 35 | #include <forward_list> | ||
| 36 | #include <thread> | ||
| 37 | +#include <cinttypes> | ||
| 38 | |||
| 39 | #if defined(__linux__) || defined(__QNX__) | ||
| 40 | #include <unistd.h> | ||
| 41 | @@ -3914,7 +3915,8 @@ void routing_manager_impl::memory_log_timer_cbk(boost::system::error_code const& | ||
| 42 | std::uint64_t its_dirtypages(0); | ||
| 43 | |||
| 44 | if (EOF | ||
| 45 | - == std::fscanf(its_file, "%lu %lu %lu %lu %lu %lu %lu", &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, &its_data, | ||
| 46 | + == std::fscanf(its_file, "%" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64, | ||
| 47 | + &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, &its_data, | ||
| 48 | &its_dirtypages)) { | ||
| 49 | VSOMEIP_ERROR << "memory_log_timer_cbk: error reading: errno " << errno; | ||
| 50 | } | ||
| 51 | diff --git a/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp b/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp | ||
| 52 | index aaf91174..dfe27e8c 100644 | ||
| 53 | --- a/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp | ||
| 54 | +++ b/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp | ||
| 55 | @@ -12,6 +12,7 @@ | ||
| 56 | #include <vector> | ||
| 57 | #include <stdexcept> | ||
| 58 | #include <cstdio> | ||
| 59 | +#include <cinttypes> | ||
| 60 | |||
| 61 | #include <sys/types.h> | ||
| 62 | #include <unistd.h> | ||
| 63 | @@ -86,7 +87,7 @@ std::uint64_t cpu_load_measurer::read_proc_pid_stat() { | ||
| 64 | std::int64_t cstime(0); | ||
| 65 | if (std::fscanf(f, | ||
| 66 | "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u " | ||
| 67 | - "%lu %lu %ld %ld", // utime, stime, cutime, cstime | ||
| 68 | + "%" SCNu64 " %" SCNu64 " %" SCNi64 " %" SCNi64, // utime, stime, cutime, cstime | ||
| 69 | &utime, &stime, &cutime, &cstime) | ||
| 70 | == EOF) { | ||
| 71 | std::cerr << "Failed to read " + path << std::endl; | ||
| 72 | @@ -116,7 +117,8 @@ std::uint64_t cpu_load_measurer::read_proc_stat(std::uint64_t* _idle) { | ||
| 73 | std::uint64_t steal(0); | ||
| 74 | std::uint64_t guest(0); | ||
| 75 | std::uint64_t guest_nice(0); | ||
| 76 | - if (std::fscanf(f, "%*s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", &user, &nice, &system, &idle, &iowait, &irq, &softirq, &steal, &guest, | ||
| 77 | + if (std::fscanf(f, "%*s %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64, | ||
| 78 | + &user, &nice, &system, &idle, &iowait, &irq, &softirq, &steal, &guest, | ||
| 79 | &guest_nice) | ||
| 80 | == EOF) { | ||
| 81 | std::cerr << "Failed to read /proc/stat" << std::endl; | ||
| 82 | diff --git a/test/network_tests/memory_tests/memory_test_client.cpp b/test/network_tests/memory_tests/memory_test_client.cpp | ||
| 83 | index 102c8218..d922ad81 100644 | ||
| 84 | --- a/test/network_tests/memory_tests/memory_test_client.cpp | ||
| 85 | +++ b/test/network_tests/memory_tests/memory_test_client.cpp | ||
| 86 | @@ -6,6 +6,7 @@ | ||
| 87 | #include <chrono> | ||
| 88 | #include <iomanip> | ||
| 89 | #include <cstring> | ||
| 90 | +#include <cinttypes> | ||
| 91 | |||
| 92 | #include <vsomeip/internal/logger.hpp> | ||
| 93 | #include "memory_test_client.hpp" | ||
| 94 | @@ -30,7 +31,8 @@ void check_memory(std::vector<std::uint64_t>& test_memory_, std::atomic<bool>& s | ||
| 95 | std::uint64_t its_dirtypages(0); | ||
| 96 | |||
| 97 | if (EOF | ||
| 98 | - == std::fscanf(its_file, "%lu %lu %lu %lu %lu %lu %lu", &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, | ||
| 99 | + == std::fscanf(its_file, "%" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64, | ||
| 100 | + &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, | ||
| 101 | &its_data, &its_dirtypages)) { | ||
| 102 | VSOMEIP_ERROR << "check_memory: error reading: errno " << errno; | ||
| 103 | } | ||
| 104 | diff --git a/test/network_tests/memory_tests/memory_test_service.cpp b/test/network_tests/memory_tests/memory_test_service.cpp | ||
| 105 | index a8547395..751c6f9e 100644 | ||
| 106 | --- a/test/network_tests/memory_tests/memory_test_service.cpp | ||
| 107 | +++ b/test/network_tests/memory_tests/memory_test_service.cpp | ||
| 108 | @@ -5,6 +5,7 @@ | ||
| 109 | |||
| 110 | #include <vsomeip/internal/logger.hpp> | ||
| 111 | #include <cstring> | ||
| 112 | +#include <cinttypes> | ||
| 113 | |||
| 114 | #include "memory_test_service.hpp" | ||
| 115 | |||
| 116 | @@ -28,7 +29,8 @@ void check_memory(std::vector<std::uint64_t>& test_memory_, std::atomic<bool>& s | ||
| 117 | std::uint64_t its_dirtypages(0); | ||
| 118 | |||
| 119 | if (EOF | ||
| 120 | - == std::fscanf(its_file, "%lu %lu %lu %lu %lu %lu %lu", &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, | ||
| 121 | + == std::fscanf(its_file, "%" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64, | ||
| 122 | + &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, | ||
| 123 | &its_data, &its_dirtypages)) { | ||
| 124 | VSOMEIP_ERROR << "check_memory: error reading: errno " << errno; | ||
| 125 | } | ||
| 126 | -- | ||
| 127 | 2.34.1 | ||
| 128 | |||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0007-Do-not-treat-warnings-as-errors-with-clang.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0007-Do-not-treat-warnings-as-errors-with-clang.patch new file mode 100644 index 0000000000..31e7efcf33 --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0007-Do-not-treat-warnings-as-errors-with-clang.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | From 74c6e762097ad8016d1410bd1beaef1398f02901 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Wed, 5 Nov 2025 22:17:14 +0800 | ||
| 4 | Subject: [PATCH] Do not treat warnings as errors with clang | ||
| 5 | |||
| 6 | There are some warnings when building with clang which are treated as | ||
| 7 | errors and fails the build. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [oe specific] | ||
| 10 | |||
| 11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 12 | --- | ||
| 13 | CMakeLists.txt | 4 ++-- | ||
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 17 | index ddc1eed8..62b096e7 100644 | ||
| 18 | --- a/CMakeLists.txt | ||
| 19 | +++ b/CMakeLists.txt | ||
| 20 | @@ -73,7 +73,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") | ||
| 21 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
| 22 | # This is only relevant for GCC and causes warnings on Clang | ||
| 23 | set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc") | ||
| 24 | - set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -Wno-tsan -Wl,-z,relro,-z,now") | ||
| 25 | + set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -Wno-tsan -Wl,-z,relro,-z,now -Werror") | ||
| 26 | endif() | ||
| 27 | |||
| 28 | set(NO_DEPRECATED "") | ||
| 29 | @@ -82,7 +82,7 @@ endif() | ||
| 30 | if(NOT DEFINED _FORTIFY_SOURCE) | ||
| 31 | set(_FORTIFY_SOURCE 2) | ||
| 32 | endif() | ||
| 33 | - set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -Wno-inconsistent-missing-override") | ||
| 34 | + set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Wno-inconsistent-missing-override") | ||
| 35 | |||
| 36 | # force all use of std::mutex and std::recursive_mutex to use runtime init | ||
| 37 | # instead of static initialization so mutexes can be hooked to enable PI as needed | ||
| 38 | -- | ||
| 39 | 2.34.1 | ||
| 40 | |||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.3.bb b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.10.bb index f854078004..0455e23caa 100644 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.3.bb +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.10.bb | |||
| @@ -7,25 +7,27 @@ SECTION = "net" | |||
| 7 | LICENSE = "MPL-2.0" | 7 | LICENSE = "MPL-2.0" |
| 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" |
| 9 | 9 | ||
| 10 | GTEST_VER = "1.15.2" | 10 | GTEST_VER = "1.17.0" |
| 11 | SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name=vsomeip \ | 11 | SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name=vsomeip \ |
| 12 | https://github.com/google/googletest/releases/download/v${GTEST_VER}/googletest-${GTEST_VER}.tar.gz;name=gtest;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/ \ | 12 | https://github.com/google/googletest/releases/download/v${GTEST_VER}/googletest-${GTEST_VER}.tar.gz;name=gtest;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/ \ |
| 13 | file://0001-Fix-pkgconfig-dir-for-multilib.patch \ | 13 | file://0001-Fix-pkgconfig-dir-for-multilib.patch \ |
| 14 | file://0002-Install-example-configuration-files-to-etc-vsomeip.patch \ | 14 | file://0002-Install-example-configuration-files-to-etc-vsomeip.patch \ |
| 15 | file://0004-Do-not-specify-PIE-flag-explicitly.patch \ | 15 | file://0003-Do-not-specify-PIE-flag-explicitly.patch \ |
| 16 | file://0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch \ | 16 | file://0004-Fix-build-with-boost-1.89.patch \ |
| 17 | file://0005-Replace-address-from_string-with-make_address.patch \ | ||
| 18 | file://0006-Fix-scanning-64-bit-integer-types.patch \ | ||
| 19 | file://0007-Do-not-treat-warnings-as-errors-with-clang.patch \ | ||
| 17 | " | 20 | " |
| 18 | 21 | ||
| 19 | SRCREV = "6461369b3874c844642c9adaac9d1b7406794ab8" | 22 | SRCREV = "c4e0db329da9b63f511f3c2456c040582daf9305" |
| 20 | SRC_URI[gtest.sha256sum] = "7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926" | 23 | SRC_URI[gtest.sha256sum] = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c" |
| 21 | 24 | ||
| 22 | COMPATIBLE_HOST:mips = "null" | 25 | COMPATIBLE_HOST:mips = "null" |
| 23 | COMPATIBLE_HOST:mips64 = "null" | 26 | COMPATIBLE_HOST:mips64 = "null" |
| 24 | COMPATIBLE_HOST:powerpc = "null" | 27 | COMPATIBLE_HOST:powerpc = "null" |
| 25 | COMPATIBLE_HOST:libc-musl = 'null' | 28 | COMPATIBLE_HOST:libc-musl = 'null' |
| 26 | 29 | ||
| 27 | DEPENDS = "boost dlt-daemon googletest" | 30 | DEPENDS = "boost dlt-daemon" |
| 28 | |||
| 29 | 31 | ||
| 30 | inherit cmake pkgconfig | 32 | inherit cmake pkgconfig |
| 31 | 33 | ||
| @@ -43,9 +45,10 @@ EXTRA_OECMAKE += "-DTEST_IP_MASTER=10.0.3.1 \ | |||
| 43 | 45 | ||
| 44 | RDEPENDS:${PN}-test = "bash lsof" | 46 | RDEPENDS:${PN}-test = "bash lsof" |
| 45 | 47 | ||
| 46 | do_compile:append() { | 48 | OECMAKE_TARGET_COMPILE += "vsomeip_ctrl examples build_tests" |
| 47 | cmake_runcmake_build --target examples | 49 | |
| 48 | cmake_runcmake_build --target build_tests | 50 | do_compile:prepend() { |
| 51 | sed -i -e 's#${S}/build#/opt/${PN}-test#g' ${S}/test/unit_tests/security_policy_manager_impl_tests/policy_manager_impl_unit_test_macro.hpp | ||
| 49 | } | 52 | } |
| 50 | 53 | ||
| 51 | do_install:append() { | 54 | do_install:append() { |
| @@ -58,13 +61,17 @@ do_install:append() { | |||
| 58 | install -d ${D}/opt/${PN}-test/test/test/common | 61 | install -d ${D}/opt/${PN}-test/test/test/common |
| 59 | cp -rf ${S}/test/common/examples_policies \ | 62 | cp -rf ${S}/test/common/examples_policies \ |
| 60 | ${D}/opt/${PN}-test/test/test/common/ | 63 | ${D}/opt/${PN}-test/test/test/common/ |
| 64 | |||
| 65 | install -d ${D}/opt/${PN}-test/test/common | ||
| 61 | install -m 0755 ${B}/test/common/libvsomeip_utilities.so \ | 66 | install -m 0755 ${B}/test/common/libvsomeip_utilities.so \ |
| 62 | ${D}/opt/${PN}-test/test/test/common/ | 67 | ${D}/opt/${PN}-test/test/common/ |
| 63 | 68 | ||
| 64 | for d in unit_tests network_tests; do | 69 | for d in unit_tests network_tests; do |
| 65 | install -d ${D}/opt/${PN}-test/test/$d | 70 | install -d ${D}/opt/${PN}-test/test/$d |
| 66 | cp -rf ${B}/test/$d/*_tests ${D}/opt/${PN}-test/test/$d | 71 | cp -rf ${B}/test/$d/*_tests ${D}/opt/${PN}-test/test/$d |
| 72 | find ${D}/opt/${PN}-test/test/$d -maxdepth 2 \( -name "*.cmake" -o -name "CMakeFiles" \) -exec rm -rf {} \; | ||
| 67 | done | 73 | done |
| 74 | sed -i -e 's#../..${B}#/opt/${PN}-test#g' ${D}/opt/${PN}-test/test/network_tests/lazy_load_tests/vsomeip/vsomeip_policy_extensions.json | ||
| 68 | } | 75 | } |
| 69 | 76 | ||
| 70 | PACKAGES += "${PN}-test" | 77 | PACKAGES += "${PN}-test" |
| @@ -75,4 +82,5 @@ FILES:${PN}-dbg += " \ | |||
| 75 | FILES:${PN}-test = " \ | 82 | FILES:${PN}-test = " \ |
| 76 | /opt/${PN}-test \ | 83 | /opt/${PN}-test \ |
| 77 | " | 84 | " |
| 78 | SKIP_RECIPE[vsomeip] ?= "Does not work with boost >= 1.87" | 85 | |
| 86 | INSANE_SKIP += "32bit-time" | ||
diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index 78ba1e228c..a54e37562e 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc | |||
| @@ -33,6 +33,7 @@ PTESTS_FAST_META_OE = "\ | |||
| 33 | libxml++-5.0 \ | 33 | libxml++-5.0 \ |
| 34 | libyang \ | 34 | libyang \ |
| 35 | lmdb \ | 35 | lmdb \ |
| 36 | mbedtls \ | ||
| 36 | microsoft-gsl \ | 37 | microsoft-gsl \ |
| 37 | minicoredumper \ | 38 | minicoredumper \ |
| 38 | minizip-ng \ | 39 | minizip-ng \ |
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 851219765e..760edbce3e 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf | |||
| @@ -56,8 +56,10 @@ PREFERRED_RPROVIDER_libdevmapper = "lvm2" | |||
| 56 | PREFERRED_RPROVIDER_libdevmapper-native = "lvm2-native" | 56 | PREFERRED_RPROVIDER_libdevmapper-native = "lvm2-native" |
| 57 | PREFERRED_RPROVIDER_nativesdk-libdevmapper = "nativesdk-lvm2" | 57 | PREFERRED_RPROVIDER_nativesdk-libdevmapper = "nativesdk-lvm2" |
| 58 | PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" | 58 | PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" |
| 59 | # Configures whether coreutils or uutils-coreutils is used. | 59 | # Those lines configure whether coreutils or uutils-coreutils is used. |
| 60 | PREFERRED_PROVIDER_coreutils = "coreutils" | 60 | PREFERRED_PROVIDER_coreutils = "coreutils" |
| 61 | PREFERRED_PROVIDER_coreutils-native = "coreutils-native" | ||
| 62 | PREFERRED_PROVIDER_nativesdk-coreutils = "nativesdk-coreutils" | ||
| 61 | PREFERRED_PROVIDER_virtual/libopencl1 ?= "opencl-icd-loader" | 63 | PREFERRED_PROVIDER_virtual/libopencl1 ?= "opencl-icd-loader" |
| 62 | PREFERRED_RPROVIDER_virtual-redis ?= "redis" | 64 | PREFERRED_RPROVIDER_virtual-redis ?= "redis" |
| 63 | 65 | ||
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb index 1e207f7fb4..38b3e97dd2 100644 --- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb +++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb | |||
| @@ -63,6 +63,8 @@ python __anonymous() { | |||
| 63 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) | 63 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | BBCLASSEXTEND = "native nativesdk" | ||
| 67 | |||
| 66 | do_compile:prepend() { | 68 | do_compile:prepend() { |
| 67 | export LIBSTDBUF_DIR="${libdir}/coreutils" | 69 | export LIBSTDBUF_DIR="${libdir}/coreutils" |
| 68 | } | 70 | } |
diff --git a/meta-oe/recipes-devtools/gpp/gpp_2.28.bb b/meta-oe/recipes-devtools/gpp/gpp_2.28.bb new file mode 100644 index 0000000000..7c6c386bc6 --- /dev/null +++ b/meta-oe/recipes-devtools/gpp/gpp_2.28.bb | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | SUMMARY = "Generic Preprocessor" | ||
| 2 | DESCRIPTION = "GPP is a general-purpose preprocessor with customizable syntax, suitable for a wide range of preprocessing tasks" | ||
| 3 | HOMEPAGE = "https://logological.org/gpp" | ||
| 4 | BUGTRACKER = "https://github.com/logological/gpp/issues" | ||
| 5 | LICENSE = "LGPL-3.0-only" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
| 7 | |||
| 8 | SRC_URI = "https://github.com/logological/gpp/releases/download/${PV}/gpp-${PV}.tar.bz2" | ||
| 9 | SRC_URI[sha256sum] = "343d33d562e2492ca9b51ff2cc4b06968a17a85fdc59d5d4e78eed3b1d854b70" | ||
| 10 | |||
| 11 | inherit autotools | ||
| 12 | |||
| 13 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb index f4d206c154..28c1063ceb 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb | |||
| @@ -207,6 +207,11 @@ do_install() { | |||
| 207 | 207 | ||
| 208 | sed -i "s|@MINIFI_LOG@|${MINIFI_LOG}|g" ${D}${sysconfdir}/default/volatiles/99_minifi | 208 | sed -i "s|@MINIFI_LOG@|${MINIFI_LOG}|g" ${D}${sysconfdir}/default/volatiles/99_minifi |
| 209 | fi | 209 | fi |
| 210 | |||
| 211 | for ss in $(find ${D}${libexecdir}/minifi-python-examples -type f); do | ||
| 212 | sed -i 's,/usr/bin/env python$,/usr/bin/env python3,' "$ss" | ||
| 213 | done | ||
| 214 | |||
| 210 | } | 215 | } |
| 211 | 216 | ||
| 212 | pkg_postinst:${PN}() { | 217 | pkg_postinst:${PN}() { |
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0001-hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0001-hiredis-use-default-CC-if-it-is-set.patch index 63bf403412..99783ce237 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.11/0001-hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0001-hiredis-use-default-CC-if-it-is-set.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From af4fc632c03b2a68be4206b4896f27fc4bb865ae Mon Sep 17 00:00:00 2001 | 1 | From 2fec7733df9a6224875f3ecd3aaafc2857a546c0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Venture Research <tech@ventureresearch.com> | 2 | From: Venture Research <tech@ventureresearch.com> |
| 3 | Date: Fri, 8 Feb 2013 17:39:52 -0600 | 3 | Date: Fri, 8 Feb 2013 17:39:52 -0600 |
| 4 | Subject: [PATCH] hiredis: use default CC if it is set | 4 | Subject: [PATCH] hiredis: use default CC if it is set |
| @@ -6,6 +6,10 @@ MIME-Version: 1.0 | |||
| 6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
| 8 | 8 | ||
| 9 | MIME-Version: 1.0 | ||
| 10 | Content-Type: text/plain; charset=UTF-8 | ||
| 11 | Content-Transfer-Encoding: 8bit | ||
| 12 | |||
| 9 | Instead of trying to automagically figure out CC, which breaks with OE | 13 | Instead of trying to automagically figure out CC, which breaks with OE |
| 10 | as CC has spaces in it, just skip it if one was already passed in. | 14 | as CC has spaces in it, just skip it if one was already passed in. |
| 11 | 15 | ||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0002-lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0002-lua-update-Makefile-to-use-environment-build-setting.patch index 46330f5064..a3365043b5 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.11/0002-lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0002-lua-update-Makefile-to-use-environment-build-setting.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 45ae5eb5c3482054073e06ab1a78e0aa9b96447f Mon Sep 17 00:00:00 2001 | 1 | From 71d92a24da61eab1e3697cc83ebc387b57bb6c3b Mon Sep 17 00:00:00 2001 |
| 2 | From: Venture Research <tech@ventureresearch.com> | 2 | From: Venture Research <tech@ventureresearch.com> |
| 3 | Date: Fri, 8 Feb 2013 20:22:19 -0600 | 3 | Date: Fri, 8 Feb 2013 20:22:19 -0600 |
| 4 | Subject: [PATCH] lua: update Makefile to use environment build settings | 4 | Subject: [PATCH] lua: update Makefile to use environment build settings |
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0003-hack-to-force-use-of-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0003-hack-to-force-use-of-libc-malloc.patch index 8991d2d9bc..4ab1ca0ca8 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.11/0003-hack-to-force-use-of-libc-malloc.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0003-hack-to-force-use-of-libc-malloc.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 7a98e3ac480413ce7db3a5edd5dc70458b921b29 Mon Sep 17 00:00:00 2001 | 1 | From 577335d0309c852d9f6099c255d5a80603fcbdb9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Venture Research <tech@ventureresearch.com> | 2 | From: Venture Research <tech@ventureresearch.com> |
| 3 | Date: Wed, 6 Feb 2013 20:51:02 -0600 | 3 | Date: Wed, 6 Feb 2013 20:51:02 -0600 |
| 4 | Subject: [PATCH] hack to force use of libc malloc | 4 | Subject: [PATCH] hack to force use of libc malloc |
| @@ -19,10 +19,10 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | |||
| 19 | src/Makefile | 3 ++- | 19 | src/Makefile | 3 ++- |
| 20 | 1 file changed, 2 insertions(+), 1 deletion(-) | 20 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 21 | 21 | ||
| 22 | Index: redis-7.2.10/src/Makefile | 22 | diff --git a/src/Makefile b/src/Makefile |
| 23 | =================================================================== | 23 | index 6a87909..b8e0d44 100644 |
| 24 | --- redis-7.2.10.orig/src/Makefile | 24 | --- a/src/Makefile |
| 25 | +++ redis-7.2.10/src/Makefile | 25 | +++ b/src/Makefile |
| 26 | @@ -13,7 +13,8 @@ | 26 | @@ -13,7 +13,8 @@ |
| 27 | # Just use 'make dep', but this is only needed by developers. | 27 | # Just use 'make dep', but this is only needed by developers. |
| 28 | 28 | ||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0004-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0004-src-Do-not-reset-FINAL_LIBS.patch index 0513138b4e..71044365af 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.11/0004-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0004-src-Do-not-reset-FINAL_LIBS.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 50fc46a12f6cf97e7b927d3ea29eecc9ebdea34d Mon Sep 17 00:00:00 2001 | 1 | From 225f45d5fbeaa8998fac983fcb78d7912d6d6dd3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 10 Sep 2019 20:04:26 -0700 | 3 | Date: Tue, 10 Sep 2019 20:04:26 -0700 |
| 4 | Subject: [PATCH] src: Do not reset FINAL_LIBS | 4 | Subject: [PATCH] src: Do not reset FINAL_LIBS |
| @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 15 | src/Makefile | 2 +- | 15 | src/Makefile | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | 17 | ||
| 18 | Index: redis-7.2.10/src/Makefile | 18 | diff --git a/src/Makefile b/src/Makefile |
| 19 | =================================================================== | 19 | index b8e0d44..3a68fa6 100644 |
| 20 | --- redis-7.2.10.orig/src/Makefile | 20 | --- a/src/Makefile |
| 21 | +++ redis-7.2.10/src/Makefile | 21 | +++ b/src/Makefile |
| 22 | @@ -122,7 +122,7 @@ endif | 22 | @@ -122,7 +122,7 @@ endif |
| 23 | 23 | ||
| 24 | FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) | 24 | FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) |
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch index 8e5f30993b..a45de28e0e 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.11/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From acd832d76002a1916b3128ac05bc0296425aea6d Mon Sep 17 00:00:00 2001 | 1 | From b636c748fb4047b1ef3a4062c675e1ee4584230b Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 21 Dec 2019 12:09:51 -0800 | 3 | Date: Sat, 21 Dec 2019 12:09:51 -0800 |
| 4 | Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER | 4 | Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER |
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0006-Define-correct-gregs-for-RISCV32.patch index 7009048171..bf44858d16 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.11/0006-Define-correct-gregs-for-RISCV32.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0006-Define-correct-gregs-for-RISCV32.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From dd3ecb07bbf80b986b8f2c656ea11d1346e212f6 Mon Sep 17 00:00:00 2001 | 1 | From 8984a5df54fc80de1c99b311f117d28c2a42d959 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 26 Oct 2020 21:32:22 -0700 | 3 | Date: Mon, 26 Oct 2020 21:32:22 -0700 |
| 4 | Subject: [PATCH] Define correct gregs for RISCV32 | 4 | Subject: [PATCH] Define correct gregs for RISCV32 |
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/init-redis-server b/meta-oe/recipes-extended/redis/redis-7.2.12/init-redis-server index c5f335f57d..c5f335f57d 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.11/init-redis-server +++ b/meta-oe/recipes-extended/redis/redis-7.2.12/init-redis-server | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/redis.conf b/meta-oe/recipes-extended/redis/redis-7.2.12/redis.conf index 75037d6dc8..75037d6dc8 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.11/redis.conf +++ b/meta-oe/recipes-extended/redis/redis-7.2.12/redis.conf | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/redis.service b/meta-oe/recipes-extended/redis/redis-7.2.12/redis.service index b7791d0df4..b7791d0df4 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.11/redis.service +++ b/meta-oe/recipes-extended/redis/redis-7.2.12/redis.service | |||
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.11.bb b/meta-oe/recipes-extended/redis/redis_7.2.12.bb index 83cb4531d2..6527fb6996 100644 --- a/meta-oe/recipes-extended/redis/redis_7.2.11.bb +++ b/meta-oe/recipes-extended/redis/redis_7.2.12.bb | |||
| @@ -17,12 +17,15 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ | |||
| 17 | file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \ | 17 | file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \ |
| 18 | file://0006-Define-correct-gregs-for-RISCV32.patch \ | 18 | file://0006-Define-correct-gregs-for-RISCV32.patch \ |
| 19 | " | 19 | " |
| 20 | SRC_URI[sha256sum] = "2f9886eca68d30114ad6a01da65631f8007d802fd3e6c9fac711251e6390323d" | 20 | SRC_URI[sha256sum] = "97c60478a7c777ac914ca9d87a7e88ba265926456107e758c62d8f971d0196bc" |
| 21 | 21 | ||
| 22 | RPROVIDES:${PN} = "virtual-redis" | 22 | RPROVIDES:${PN} = "virtual-redis" |
| 23 | 23 | ||
| 24 | CVE_STATUS[CVE-2025-21605] = "cpe-incorrect: the used version already contains the fix" | 24 | CVE_STATUS[CVE-2025-21605] = "cpe-incorrect: the used version already contains the fix" |
| 25 | CVE_STATUS[CVE-2025-27151] = "cpe-incorrect: the used version already contains the fix" | 25 | CVE_STATUS[CVE-2025-27151] = "cpe-incorrect: the used version already contains the fix" |
| 26 | CVE_STATUS[CVE-2025-46817] = "cpe-incorrect: the used version already contains the fix" | ||
| 27 | CVE_STATUS[CVE-2025-46818] = "cpe-incorrect: the used version already contains the fix" | ||
| 28 | CVE_STATUS[CVE-2025-46819] = "cpe-incorrect: the used version already contains the fix" | ||
| 26 | 29 | ||
| 27 | inherit pkgconfig update-rc.d systemd useradd | 30 | inherit pkgconfig update-rc.d systemd useradd |
| 28 | 31 | ||
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb index d3a01e444c..439ab800f8 100644 --- a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb +++ b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb | |||
| @@ -3,8 +3,10 @@ HOMEPAGE = "http://www.gtkmm.org/" | |||
| 3 | SECTION = "libs" | 3 | SECTION = "libs" |
| 4 | 4 | ||
| 5 | LICENSE = "LGPL-2.1-only & GPL-2.0-only" | 5 | LICENSE = "LGPL-2.1-only & GPL-2.0-only" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | 6 | LIC_FILES_CHKSUM = " \ |
| 7 | file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" | 7 | file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21 \ |
| 8 | file://COPYING.tools;md5=570a9b3749dd0463a1778803b12a6dce \ | ||
| 9 | " | ||
| 8 | 10 | ||
| 9 | DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native" | 11 | DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native" |
| 10 | 12 | ||
| @@ -14,7 +16,7 @@ inherit gnomebase features_check | |||
| 14 | 16 | ||
| 15 | REQUIRED_DISTRO_FEATURES = "opengl x11" | 17 | REQUIRED_DISTRO_FEATURES = "opengl x11" |
| 16 | 18 | ||
| 17 | SRC_URI[archive.sha256sum] = "9350a0444b744ca3dc69586ebd1b6707520922b6d9f4f232103ce603a271ecda" | 19 | SRC_URI[archive.sha256sum] = "daad9bf9b70f90975f91781fc7a656c923a91374261f576c883cd3aebd59c833" |
| 18 | 20 | ||
| 19 | EXTRA_OEMESON = "-Dbuild-demos=false" | 21 | EXTRA_OEMESON = "-Dbuild-demos=false" |
| 20 | 22 | ||
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.2.bb index 42507051f6..b880f3f090 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.2.bb | |||
| @@ -1,18 +1,19 @@ | |||
| 1 | SUMMARY = "library to read digital audio CDs with error correction" | 1 | SUMMARY = "library to read digital audio CDs with error correction" |
| 2 | HOMEPAGE = "http://www.gnu.org/software/libcdio/" | 2 | HOMEPAGE = "http://www.gnu.org/software/libcdio/" |
| 3 | BUGTRUCKER = "https://github.com/rocky/libcdio-paranoia/issues/" | 3 | BUGTRUCKER = "https://github.com/libcdio/libcdio-paranoia/issues" |
| 4 | SECTION = "libs" | 4 | SECTION = "libs" |
| 5 | LICENSE = "GPL-3.0-or-later" | 5 | LICENSE = "GPL-3.0-or-later" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 7 | DEPENDS = "libcdio" | 7 | DEPENDS = "libcdio" |
| 8 | 8 | ||
| 9 | SRC_URI = "${GNU_MIRROR}/libcdio/${BP}.tar.bz2" | 9 | SRC_URI = "${GITHUB_BASE_URI}/download/release-${PV}/${BP}.tar.bz2" |
| 10 | SRC_URI[sha256sum] = "33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a" | 10 | SRC_URI[sha256sum] = "186892539dedd661276014d71318c8c8f97ecb1250a86625256abd4defbf0d0c" |
| 11 | |||
| 12 | GITHUB_BASE_URI = "https://github.com/libcdio/${BPN}/releases/" | ||
| 11 | 13 | ||
| 12 | UPSTREAM_CHECK_URI = "https://github.com/rocky/libcdio-paranoia/releases" | ||
| 13 | UPSTREAM_CHECK_REGEX = "release-(?P<pver>\d+(\.\d+)+\+\d+(\.\d+)+)" | 14 | UPSTREAM_CHECK_REGEX = "release-(?P<pver>\d+(\.\d+)+\+\d+(\.\d+)+)" |
| 14 | 15 | ||
| 15 | inherit autotools pkgconfig | 16 | inherit autotools pkgconfig github-releases |
| 16 | 17 | ||
| 17 | PACKAGES += "${PN}-utils" | 18 | PACKAGES += "${PN}-utils" |
| 18 | 19 | ||
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch b/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch deleted file mode 100644 index 09e7dc3dfb..0000000000 --- a/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From e5e54be286bf6d8336b747503c803750bc674c57 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 30 Oct 2021 01:28:18 -0700 | ||
| 4 | Subject: [PATCH] Fix a few -Werror=format-security errors with mvprintw() | ||
| 5 | |||
| 6 | In all these places a non-constant is used as a format string which | ||
| 7 | compiler complains about. Fix by using "%s" as format. | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | src/cdda-player.c | 6 +++--- | ||
| 13 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/src/cdda-player.c b/src/cdda-player.c | ||
| 16 | index 69eddee..8834d60 100644 | ||
| 17 | --- a/src/cdda-player.c | ||
| 18 | +++ b/src/cdda-player.c | ||
| 19 | @@ -298,7 +298,7 @@ action(const char *psz_action) | ||
| 20 | psz_action); | ||
| 21 | else | ||
| 22 | snprintf(psz_action_line, sizeof(psz_action_line), "%s", "" ); | ||
| 23 | - mvprintw(LINE_ACTION, 0, psz_action_line); | ||
| 24 | + mvprintw(LINE_ACTION, 0, "%s", psz_action_line); | ||
| 25 | clrtoeol(); | ||
| 26 | refresh(); | ||
| 27 | } | ||
| 28 | @@ -1029,10 +1029,10 @@ display_tracks(void) | ||
| 29 | } | ||
| 30 | if (sub.track == i) { | ||
| 31 | attron(A_STANDOUT); | ||
| 32 | - mvprintw(i_line++, 0, line); | ||
| 33 | + mvprintw(i_line++, 0, "%s", line); | ||
| 34 | attroff(A_STANDOUT); | ||
| 35 | } else | ||
| 36 | - mvprintw(i_line++, 0, line); | ||
| 37 | + mvprintw(i_line++, 0, "%s", line); | ||
| 38 | clrtoeol(); | ||
| 39 | } | ||
| 40 | } | ||
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch b/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch deleted file mode 100644 index 0b25dff75e..0000000000 --- a/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From 08c1768aaeea86c522c0ef1705b9b6d434ebd3ae Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Chris Lamb <chris@chris-lamb.co.uk> | ||
| 3 | Date: Fri, 28 Jul 2017 11:49:13 +0100 | ||
| 4 | Subject: [PATCH] Drop LIBCDIO_SOURCE_PATH by dropping STRIP_FROM_PATH Doxygen | ||
| 5 | setup; it's not used as FULL_PATH_NAMES = no | ||
| 6 | |||
| 7 | Source: https://sources.debian.org/data/main/libc/libcdio/2.1.0-4/debian/patches/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch | ||
| 8 | Upstream-Status: Pending | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | configure.ac | 5 ----- | ||
| 12 | doc/doxygen/Doxyfile.in | 2 +- | ||
| 13 | 2 files changed, 1 insertion(+), 6 deletions(-) | ||
| 14 | |||
| 15 | Index: b/configure.ac | ||
| 16 | =================================================================== | ||
| 17 | --- a/configure.ac | ||
| 18 | +++ b/configure.ac | ||
| 19 | @@ -557,11 +557,6 @@ AC_SUBST(HAVE_SOLARIS_CDROM) | ||
| 20 | AC_SUBST(HAVE_WIN32_CDROM) | ||
| 21 | AC_SUBST(HAVE_OS2_CDROM) | ||
| 22 | |||
| 23 | -LIBCDIO_SOURCE_PATH="`pwd`" | ||
| 24 | -AC_DEFINE_UNQUOTED(LIBCDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH", | ||
| 25 | - [Full path to libcdio top_sourcedir.]) | ||
| 26 | -AC_SUBST(LIBCDIO_SOURCE_PATH) | ||
| 27 | - | ||
| 28 | AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \ | ||
| 29 | getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \ | ||
| 30 | seteuid setegid snprintf setenv strndup unsetenv tzset sleep \ | ||
| 31 | Index: b/doc/doxygen/Doxyfile.in | ||
| 32 | =================================================================== | ||
| 33 | --- a/doc/doxygen/Doxyfile.in | ||
| 34 | +++ b/doc/doxygen/Doxyfile.in | ||
| 35 | @@ -138,7 +138,7 @@ FULL_PATH_NAMES = NO | ||
| 36 | # If left blank the directory from which doxygen is run is used as the | ||
| 37 | # path to strip. | ||
| 38 | |||
| 39 | -STRIP_FROM_PATH = @LIBCDIO_SOURCE_PATH@ | ||
| 40 | +STRIP_FROM_PATH = | ||
| 41 | |||
| 42 | # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of | ||
| 43 | # the path mentioned in the documentation of a class, which tells | ||
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.2.0.bb index d986f90d72..c443d9b891 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.2.0.bb | |||
| @@ -4,14 +4,11 @@ SECTION = "libs" | |||
| 4 | LICENSE = "GPL-3.0-or-later" | 4 | LICENSE = "GPL-3.0-or-later" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 6 | 6 | ||
| 7 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2 \ | 7 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.bz2" |
| 8 | file://0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch \ | ||
| 9 | file://Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch \ | ||
| 10 | " | ||
| 11 | 8 | ||
| 12 | SRC_URI[sha256sum] = "8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b" | 9 | SRC_URI[sha256sum] = "6f8fbdf4d189cf63f2a7a1549c516cd720c7b222c7aaadbc924a26e745a48539" |
| 13 | 10 | ||
| 14 | inherit autotools pkgconfig | 11 | inherit autotools pkgconfig github-releases |
| 15 | 12 | ||
| 16 | PACKAGECONFIG ??= "cdda-player" | 13 | PACKAGECONFIG ??= "cdda-player" |
| 17 | PACKAGECONFIG[cdda-player] = "--with-cdda-player,--without-cdda-player,ncurses" | 14 | PACKAGECONFIG[cdda-player] = "--with-cdda-player,--without-cdda-player,ncurses" |
diff --git a/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch b/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch deleted file mode 100644 index 814912650b..0000000000 --- a/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | https://github.com/google/googletest/issues/4701 | ||
| 2 | |||
| 3 | taken from fedora: | ||
| 4 | https://src.fedoraproject.org/rpms/gtest/c/b3fe6f803a1e554971f70e1c3f55aa5fcb377b1b?branch=rawhide | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
| 8 | |||
| 9 | --- ./googletest/include/gtest/internal/gtest-port.h.orig 2025-01-27 03:39:18.963893931 +0000 | ||
| 10 | +++ ./googletest/include/gtest/internal/gtest-port.h 2025-01-28 13:57:51.381081952 +0000 | ||
| 11 | @@ -288,11 +288,11 @@ | ||
| 12 | |||
| 13 | // Detect C++ feature test macros as gracefully as possible. | ||
| 14 | // MSVC >= 19.15, Clang >= 3.4.1, and GCC >= 4.1.2 support feature test macros. | ||
| 15 | -#if GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && \ | ||
| 16 | - (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<version>)) | ||
| 17 | +#if GTEST_INTERNAL_HAS_INCLUDE(<version>) || \ | ||
| 18 | + (GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && !defined(__has_include)) | ||
| 19 | #include <version> // C++20 and later | ||
| 20 | -#elif (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<ciso646>)) | ||
| 21 | -#include <ciso646> // Pre-C++20 | ||
| 22 | +#else | ||
| 23 | +#include <cerrno> // Pre-C++20 | ||
| 24 | #endif | ||
| 25 | |||
| 26 | #include <ctype.h> // for isspace, etc | ||
diff --git a/meta-oe/recipes-test/googletest/googletest_1.16.0.bb b/meta-oe/recipes-test/googletest/googletest_1.17.0.bb index 55d670a428..c8ed80053d 100644 --- a/meta-oe/recipes-test/googletest/googletest_1.16.0.bb +++ b/meta-oe/recipes-test/googletest/googletest_1.17.0.bb | |||
| @@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" | |||
| 6 | 6 | ||
| 7 | PROVIDES += "gmock gtest" | 7 | PROVIDES += "gmock gtest" |
| 8 | 8 | ||
| 9 | SRCREV = "6910c9d9165801d8827d628cb72eb7ea9dd538c5" | 9 | SRC_URI = "git://github.com/google/googletest.git;branch=v1.17.x;protocol=https \ |
| 10 | SRC_URI = "git://github.com/google/googletest.git;branch=v1.16.x;protocol=https \ | 10 | " |
| 11 | file://gtest-ciso646.patch \ | 11 | SRCREV = "52eb8108c5bdec04579160ae17225d66034bd723" |
| 12 | " | ||
| 13 | 12 | ||
| 14 | inherit cmake pkgconfig | 13 | inherit cmake pkgconfig |
| 15 | 14 | ||
diff --git a/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb b/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb index 6f862804ce..d83c37e850 100644 --- a/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb +++ b/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb | |||
| @@ -14,7 +14,10 @@ SRC_URI[sha256sum] = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c415 | |||
| 14 | inherit pypi setuptools3 | 14 | inherit pypi setuptools3 |
| 15 | 15 | ||
| 16 | RDEPENDS:${PN} += "\ | 16 | RDEPENDS:${PN} += "\ |
| 17 | python3-misc \ | ||
| 17 | python3-crypt \ | 18 | python3-crypt \ |
| 18 | python3-logging \ | 19 | python3-logging \ |
| 19 | python3-netclient \ | 20 | python3-netclient \ |
| 20 | " | 21 | " |
| 22 | |||
| 23 | BBCLASSEXTEND = "native" \ No newline at end of file | ||
diff --git a/meta-python/recipes-devtools/python/python3-systemd_235.bb b/meta-python/recipes-devtools/python/python3-systemd_235.bb index 6b44751df7..269e175cc5 100644 --- a/meta-python/recipes-devtools/python/python3-systemd_235.bb +++ b/meta-python/recipes-devtools/python/python3-systemd_235.bb | |||
| @@ -15,3 +15,6 @@ inherit pypi features_check pkgconfig setuptools3 | |||
| 15 | REQUIRED_DISTRO_FEATURES = "systemd" | 15 | REQUIRED_DISTRO_FEATURES = "systemd" |
| 16 | 16 | ||
| 17 | RDEPENDS:${PN} += "systemd python3-syslog python3-logging python3-syslog" | 17 | RDEPENDS:${PN} += "systemd python3-syslog python3-logging python3-syslog" |
| 18 | |||
| 19 | # v235's setup.py is not written in a way to avoid race condition | ||
| 20 | PARALLEL_MAKE = "-j 1" | ||
diff --git a/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb b/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb index 7a4ac0e796..6a54d3a79a 100644 --- a/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb +++ b/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb | |||
| @@ -7,3 +7,5 @@ inherit pypi setuptools3 | |||
| 7 | SRC_URI[sha256sum] = "881fb75bb1654ed55d86060bb067f2c716f8e155f57bb73fd444e53713aafec8" | 7 | SRC_URI[sha256sum] = "881fb75bb1654ed55d86060bb067f2c716f8e155f57bb73fd444e53713aafec8" |
| 8 | 8 | ||
| 9 | RDEPENDS:${PN} += "python3-six python3-logging" | 9 | RDEPENDS:${PN} += "python3-six python3-logging" |
| 10 | |||
| 11 | BBCLASSEXTEND = "native" \ No newline at end of file | ||
