diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-filesystem-gitclone.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-filesystem-gitclone.patch index 917b70f58e..47860167bf 100644 --- a/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-filesystem-gitclone.patch +++ b/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-filesystem-gitclone.patch @@ -1,3 +1,6 @@ +From cc4874a304379aaf372955a3ecd83ae825fd5ed3 Mon Sep 17 00:00:00 2001 +From: Liu Yiding +Date: Wed, 9 Sep 2026 11:09:16 +0300 Subject: [PATCH] cmake: disable filesystem gitclone In Yocto we don't download filesystem, it is satisfied from source dir. @@ -9,29 +12,58 @@ Fix error log as following: | CMake Error at bit7z/4.0.11/build/_deps/ghc_filesystem-subbuild/ghc_filesystem-populate-prefix/tmp/ghc_filesystem-populate-gitclone.cmake:50 (message): | Failed to clone repository: 'https://github.com/rikyoz/filesystem.git' + +Apply the same approach for bit7z-test-data in tests/CMakeLists.txt +to fix error log as following: + +| Failed to clone repository: +| +| 'https://github.com/rikyoz/bit7z-test-data.git' + Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Liu Yiding +Signed-off-by: Leon Anavi --- cmake/Dependencies.cmake | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + tests/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index 110d9c2b..dc1dead8 100644 +index 1e787070..03dfa3d9 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake -@@ -39,10 +39,9 @@ if( NOT USE_STANDARD_FILESYSTEM OR NOT STANDARD_FILESYSTEM_COMPILES OR BIT7Z_BUI - CPMAddPackage( NAME ghc_filesystem - GITHUB_REPOSITORY rikyoz/filesystem - GIT_TAG b99c2aebd5ddd6fb2f190731ba80b949fc3842b5 -- DOWNLOAD_ONLY YES ) -+ SOURCE_DIR "${CPM_SOURCE_CACHE}/ghc_filesystem" ) +@@ -84,7 +84,7 @@ if( NOT USE_STANDARD_FILESYSTEM OR BIT7Z_BUILD_TESTS ) + GITHUB_REPOSITORY rikyoz/filesystem + GIT_TAG b99c2aebd5ddd6fb2f190731ba80b949fc3842b5 + GIT_PROGRESS ON +- DOWNLOAD_ONLY YES ++ SOURCE_DIR "${CPM_SOURCE_CACHE}/ghc_filesystem" + ) + + # Normalize to a plain "ghc_filesystem" target that the rest of the build and the tests link, +@@ -92,7 +92,6 @@ if( NOT USE_STANDARD_FILESYSTEM OR BIT7Z_BUILD_TESTS ) if( ghc_filesystem_ADDED ) + # Downloaded sources: expose the header-only library straight from its source tree. message( STATUS "ghc::filesystem source code available at ${ghc_filesystem_SOURCE_DIR}" ) - add_library( ghc_filesystem INTERFACE IMPORTED ) target_include_directories( ghc_filesystem SYSTEM INTERFACE ${ghc_filesystem_SOURCE_DIR}/include ) - endif() - endif() --- + if( BIT7Z_USE_PCH AND CMAKE_VERSION VERSION_GREATER_EQUAL "3.16.0" ) + target_precompile_headers( +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 5f5c8c62..ddfd735a 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -72,8 +72,8 @@ if( BIT7Z_TESTS_FILESYSTEM ) + NAME bit7z_test_data + GITHUB_REPOSITORY "rikyoz/bit7z-test-data" + VERSION 1.18.2 +- DOWNLOAD_ONLY YES + GIT_PROGRESS ON ++ SOURCE_DIR "${CPM_SOURCE_CACHE}/bit7z_test_data" + ) + if( bit7z_test_data_ADDED ) + set( BIT7Z_TESTS_DATA_DIR ${bit7z_test_data_SOURCE_DIR} ) +-- 2.43.0 diff --git a/meta-oe/recipes-extended/7zip/bit7z/0002-tests-CMakeLists.txt-Remove-reference-to-TMPDIR.patch b/meta-oe/recipes-extended/7zip/bit7z/0002-tests-CMakeLists.txt-Remove-reference-to-TMPDIR.patch new file mode 100644 index 0000000000..eba1d66846 --- /dev/null +++ b/meta-oe/recipes-extended/7zip/bit7z/0002-tests-CMakeLists.txt-Remove-reference-to-TMPDIR.patch @@ -0,0 +1,60 @@ +From 0ea00afd5217683074f263027df6c28c03b25e1e Mon Sep 17 00:00:00 2001 +From: Leon Anavi +Date: Wed, 9 Sep 2026 16:00:00 +0300 +Subject: [PATCH] tests/CMakeLists.txt: Remove reference to TMPDIR + +Adjust the path where the tests data directory will actually be +located when running the tests on the target device. + +Fixes: + +ERROR: bit7z-4.1.0-r0 do_package_qa: QA Issue: File +/usr/lib/bit7z/ptest/bit7z-tests-public-cpp20 in package +bit7z-ptest contains reference to TMPDIR [buildpaths] +ERROR: bit7z-4.1.0-r0 do_package_qa: QA Issue: File +/usr/lib/bit7z/ptest/bit7z-tests in package bit7z-ptest contains +reference to TMPDIR [buildpaths] +ERROR: bit7z-4.1.0-r0 do_package_qa: QA Issue: File +/usr/lib/bit7z/ptest/bit7z-tests-public in package bit7z-ptest +contains reference to TMPDIR [buildpaths] +ERROR: bit7z-4.1.0-r0 do_package_qa: Fatal QA errors were found, +failing task. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Leon Anavi +--- + tests/CMakeLists.txt | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 2af67faa..64573893 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -94,8 +94,15 @@ if( BIT7Z_TESTS_FILESYSTEM ) + message( STATUS "Custom test data dir: ${BIT7Z_TESTS_DATA_DIR}" ) + endif() + ++ # Adjust the path where the tests data directory will actually be ++ # located when running the tests on the target device. ++ set( BIT7Z_TESTS_DATA_DIR_TARGET "" CACHE STRING "The path of the tests data directory at run time" ) ++ if( BIT7Z_TESTS_DATA_DIR_TARGET STREQUAL "" ) ++ set( BIT7Z_TESTS_DATA_DIR_TARGET ${BIT7Z_TESTS_DATA_DIR} ) ++ endif() ++ + target_compile_definitions( +- ${TESTS_BASE_TARGET} INTERFACE BIT7Z_TESTS_FILESYSTEM BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR}" ++ ${TESTS_BASE_TARGET} INTERFACE BIT7Z_TESTS_FILESYSTEM BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR_TARGET}" + ) + + if( NOT EXISTS ${BIT7Z_TESTS_DATA_DIR}/test_filesystem/empty ) +@@ -224,4 +231,4 @@ if( "cxx_std_20" IN_LIST CMAKE_CXX_COMPILE_FEATURES ) + set_property( TARGET ${TESTS_TARGET_PUBLIC_CPP20} PROPERTY CXX_STANDARD_REQUIRED ON ) + endif() + +-catch_discover_tests( ${TESTS_TARGET} ) +\ No newline at end of file ++catch_discover_tests( ${TESTS_TARGET} ) +-- +2.43.0 + diff --git a/meta-oe/recipes-extended/7zip/bit7z_4.0.12.bb b/meta-oe/recipes-extended/7zip/bit7z_4.1.0.bb similarity index 75% rename from meta-oe/recipes-extended/7zip/bit7z_4.0.12.bb rename to meta-oe/recipes-extended/7zip/bit7z_4.1.0.bb index 1399130e11..4661046220 100644 --- a/meta-oe/recipes-extended/7zip/bit7z_4.0.12.bb +++ b/meta-oe/recipes-extended/7zip/bit7z_4.1.0.bb @@ -8,24 +8,25 @@ SRC_URI = " \ ${@bb.utils.contains('PTEST_ENABLED', '1', d.getVar('SRC_URI_PTEST'), 'file://0001-cmake-disable-dependency-inclusion.patch', d)} \ " -SRCREV = "9a43c9fb96003141dcb49c82843382a52afec86a" +SRCREV = "c81c6c1cbf44e148cd4b06f4bb69d7ea1e299742" # ptest dependencies and their revisions SRC_URI_PTEST = " \ git://github.com/rikyoz/filesystem.git;protocol=https;branch=glibcxx_wchar_streams_workaround;name=filesystem;destsuffix=filesystem \ - git://github.com/rikyoz/bit7z-test-data.git;protocol=https;branch=main;name=testdata;destsuffix=testdata \ + git://github.com/rikyoz/bit7z-test-data.git;protocol=https;branch=main;tag=v${TAG_testdata};name=testdata;destsuffix=testdata \ git://github.com/rikyoz/Catch2.git;protocol=https;branch=single-header-v2.x;name=catch2;destsuffix=catch2 \ https://github.com/cpm-cmake/CPM.cmake/releases/download/v${TAG_CPM}/CPM.cmake;downloadfilename=CPM_${TAG_CPM}.cmake \ file://run-ptest \ file://0001-cmake-disable-filesystem-gitclone.patch \ + file://0002-tests-CMakeLists.txt-Remove-reference-to-TMPDIR.patch \ " SRCREV_FORMAT = "${@bb.utils.contains('PTEST_ENABLED', '1', 'default_filesystem_testdata_catch2', 'default', d)}" SRCREV_filesystem = "b99c2aebd5ddd6fb2f190731ba80b949fc3842b5" -SRCREV_testdata = "077e407b1c07b7443626b5902eeb4819388bf656" +SRCREV_testdata = "4a24af69edf59cd6e737e84e6477ce752ef77bdd" +TAG_testdata = "1.18.2" SRCREV_catch2 = "27d8db1770dd5cd3688656095f242474431584a1" -SRCHASH_CPM = "2020b4fc42dba44817983e06342e682ecfc3d2f484a581f11cc5731fbe4dce8a" -TAG_CPM = "0.42.0" -SRC_URI[sha256sum] = "${SRCHASH_CPM}" +TAG_CPM = "0.42.3" +SRC_URI[sha256sum] = "a609e875fd532b067174250f6abbc3dac22fe2d64869783fb1e80bda1625c844" inherit cmake ptest @@ -34,7 +35,8 @@ DEPENDS = "7zip" EXTRA_OECMAKE += "-DBIT7Z_CUSTOM_7ZIP_PATH=${STAGING_INCDIR}/7zip" -CXXFLAGS:append = " -Wno-error=array-bounds" +CXXFLAGS:append = " -Wno-error=array-bounds -Wno-sfinae-incomplete" +CXXFLAGS:append = " -I${B}/cpm_cache/ghc_filesystem/include" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG[tests] = " \ @@ -47,9 +49,18 @@ PACKAGECONFIG[tests] = " \ do_configure:prepend() { # verify that all dependencies have correct version grep -q ${SRCREV_filesystem} ${S}/cmake/Dependencies.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_filesystem'!" - grep -q ${SRCREV_testdata} ${S}/tests/CMakeLists.txt || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_testdata'!" + + FOUND_VERSION=$(grep -A5 "NAME bit7z_test_data" ${S}/tests/CMakeLists.txt | grep -oP 'VERSION \K[0-9.]+' | head -1 | tr -d '[:space:]') + if [ "${TAG_testdata}" != "${FOUND_VERSION}" ]; then + bbfatal "ERROR: dependency version mismatch, please update 'TAG_testdata'!" + fi + grep -q ${SRCREV_catch2} ${S}/tests/CMakeLists.txt || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_catch2'!" - grep -q ${SRCHASH_CPM} ${S}/cmake/Dependencies.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCHASH_CPM'!" + + FOUND_VERSION=$(grep -oP 'CPM_DOWNLOAD_VERSION\s+\K[0-9.]+' ${S}/cmake/Dependencies.cmake | tr -d '[:space:]') + if [ "${TAG_CPM}" != "${FOUND_VERSION}" ]; then + bbfatal "ERROR: dependency version mismatch, please update 'TAG_CPM'!" + fi if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then # use cache instead of download for CPM (CMake's missing package manager) @@ -73,7 +84,7 @@ do_install() { do_install_ptest() { install -m 0755 ${S}/bin/*/* ${D}${PTEST_PATH} install -d ${D}${PTEST_PATH}/data - cp -r ${UNPACKDIR}/testdata/test_archives ${UNPACKDIR}/testdata/test_filesystem ${B}/tests/data/test_filesystem ${D}${PTEST_PATH}/data + cp -r ${UNPACKDIR}/testdata/test_archives ${UNPACKDIR}/testdata/test_filesystem ${B}/cpm_cache/bit7z_test_data/test_filesystem ${D}${PTEST_PATH}/data } # this package contains static library so main package is empty, but ptest package rdepends on it