From cef9a6a40e85ab137b62efd25289504bf48b9031 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 6 Jan 2026 17:03:39 +0000 Subject: [PATCH] sys-fs/overlaybd: Patch and rework to build entirely offline Signed-off-by: James Le Cuirot --- .../profiles/coreos/base/package.use.mask | 3 + .../coreos-overlay/sys-fs/overlaybd/Manifest | 5 + ...p-after-fetching-to-fix-cmake-issues.patch | 25 -- .../files/overlaybd-offline-build.patch | 312 ++++++++++++++++++ .../overlaybd/files/yaml-cpp-cmake-4.0.patch | 42 --- .../sys-fs/overlaybd/metadata.xml | 1 + .../sys-fs/overlaybd/overlaybd-9999.ebuild | 80 +++-- 7 files changed, 378 insertions(+), 90 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/0002-Patch-yaml-cpp-after-fetching-to-fix-cmake-issues.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/overlaybd-offline-build.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/yaml-cpp-cmake-4.0.patch diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask index 552f28f580..b635b4660b 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask @@ -28,3 +28,6 @@ app-emulation/qemu X # disable all tools for NVIDIA driver, keep just kmods x11-drivers/nvidia-drivers tools X static-libs x11-drivers/old-nvidia-drivers tools X static-libs + +# We don't maintain the tarballs needed to build these features offline. + -Date: Fri, 7 Nov 2025 12:06:05 +0100 -Subject: [PATCH 2/2] Patch yaml-cpp after fetching to fix cmake issues - -Signed-off-by: Krzesimir Nowak ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 753b081..03b2ab9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,6 +53,7 @@ if (NOT yaml-cpp_FOUND) - yaml-cpp - GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git - GIT_TAG 0.8.0 -+ PATCH_COMMAND patch -p1 -i @FILESDIR@/yaml-cpp-cmake-4.0.patch - ) - FetchContent_MakeAvailable(yaml-cpp) - endif() --- -2.51.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/overlaybd-offline-build.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/overlaybd-offline-build.patch new file mode 100644 index 0000000000..b79909d5ac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/overlaybd-offline-build.patch @@ -0,0 +1,312 @@ +diff --git a/CMake/Findcurl.cmake b/CMake/FindCURL.cmake +similarity index 95% +rename from CMake/Findcurl.cmake +rename to CMake/FindCURL.cmake +index de370a5..041bd5e 100644 +--- a/CMake/Findcurl.cmake ++++ b/CMake/FindCURL.cmake +@@ -14,10 +14,8 @@ if(${BUILD_CURL_FROM_SOURCE}) + # In libcurl, CMakeLists build static lib is broken add build command via + # make + if(NOT TARGET libcurl_static_build) +- if (NOT curl_bundle_POPULATED) +- FetchContent_Populate(curl_bundle) +- endif() +- find_package(openssl) ++ FetchContent_MakeAvailable(curl_bundle) ++ find_package(OpenSSL) + add_custom_command( + OUTPUT ${curl_bundle_BINARY_DIR}/lib/libcurl.a + WORKING_DIRECTORY ${curl_bundle_SOURCE_DIR} +diff --git a/CMake/Findopenssl.cmake b/CMake/FindOpenSSL.cmake +similarity index 96% +rename from CMake/Findopenssl.cmake +rename to CMake/FindOpenSSL.cmake +index 02e55b9..dbe1d54 100644 +--- a/CMake/Findopenssl.cmake ++++ b/CMake/FindOpenSSL.cmake +@@ -14,9 +14,7 @@ if(${BUILD_CURL_FROM_SOURCE}) + FetchContent_GetProperties(openssl102) + + if(NOT TARGET openssl102_static_build) +- if(NOT openssl102_POPULATED) +- FetchContent_Populate(openssl102) +- endif() ++ FetchContent_MakeAvailable(openssl102) + add_custom_command( + OUTPUT ${openssl102_BINARY_DIR}/lib/libssl.a + WORKING_DIRECTORY ${openssl102_SOURCE_DIR} +diff --git a/CMake/FindRapidJSON.cmake b/CMake/FindRapidJSON.cmake +new file mode 100644 +index 0000000..f142f5c +--- /dev/null ++++ b/CMake/FindRapidJSON.cmake +@@ -0,0 +1,19 @@ ++find_package(PkgConfig) ++if (PKG_CONFIG_FOUND) ++ pkg_check_modules(RAPIDJSON RapidJSON) ++endif() ++ ++if (NOT RAPIDJSON_FOUND) ++ if (NOT rapidjson_POPULATED) ++ FetchContent_Populate( ++ rapidjson ++ GIT_REPOSITORY https://github.com/Tencent/rapidjson.git ++ GIT_TAG 80b6d1c83402a5785c486603c5611923159d0894 ++ GIT_SUBMODULES "" ++ ) ++ endif() ++ FetchContent_GetProperties(rapidjson) ++ set(RAPIDJSON_INCLUDE_DIRS "${rapidjson_SOURCE_DIR}/include") ++endif() ++ ++add_definitions("-DRAPIDJSON_HAS_STDSTRING=1") +diff --git a/CMake/Finde2fs.cmake b/CMake/Finde2fs.cmake +index 15c58fd..e5615a2 100644 +--- a/CMake/Finde2fs.cmake ++++ b/CMake/Finde2fs.cmake +@@ -9,9 +9,7 @@ if(NOT ORIGIN_EXT2FS) + FetchContent_GetProperties(e2fsprogs) + + if(NOT TARGET libext2fs_build) +- if (NOT e2fsprogs_POPULATED) +- FetchContent_Populate(e2fsprogs) +- endif() ++ FetchContent_MakeAvailable(e2fsprogs) + set(LIBEXT2FS_INSTALL_DIR ${e2fsprogs_SOURCE_DIR}/build/libext2fs CACHE STRING "") + + add_custom_command( +diff --git a/CMake/Findphoton.cmake b/CMake/Findphoton.cmake +index c905bd9..cdc72d2 100644 +--- a/CMake/Findphoton.cmake ++++ b/CMake/Findphoton.cmake +@@ -17,8 +17,8 @@ else() + endif() + + if (BUILD_CURL_FROM_SOURCE) +- find_package(openssl REQUIRED) +- find_package(curl REQUIRED) ++ find_package(OpenSSL REQUIRED) ++ find_package(CURL REQUIRED) + add_dependencies(photon_obj CURL::libcurl OpenSSL::SSL OpenSSL::Crypto) + endif() + +diff --git a/CMake/Findrapidjson.cmake b/CMake/Findrapidjson.cmake +deleted file mode 100644 +index 79bc3d7..0000000 +--- a/CMake/Findrapidjson.cmake ++++ /dev/null +@@ -1,12 +0,0 @@ +-FetchContent_Declare( +- rapidjson +- GIT_REPOSITORY https://github.com/Tencent/rapidjson.git +- GIT_TAG 80b6d1c83402a5785c486603c5611923159d0894 +- GIT_SUBMODULES "" +-) +-FetchContent_GetProperties(rapidjson) +-if (NOT rapidjson_POPULATED) +- FetchContent_Populate(rapidjson) +-endif() +- +-add_definitions("-DRAPIDJSON_HAS_STDSTRING=1") +\ No newline at end of file +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 753b081..f6beb46 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -44,19 +44,23 @@ set(CMAKE_CXX_STANDARD_REQUIRED on) + set(ENABLE_MIMIC_VDSO off) + + option(BUILD_CURL_FROM_SOURCE "Compile static libcurl" off) ++option(BUILD_STREAM_CONVERTOR "Build the stream convertor" on) + option(ORIGIN_EXT2FS "Use original libext2fs" off) ++ + find_package(photon REQUIRED) + find_package(tcmu REQUIRED) +-find_package(yaml-cpp) +-if (NOT yaml-cpp_FOUND) +- FetchContent_Declare( +- yaml-cpp +- GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git +- GIT_TAG 0.8.0 +- ) +- FetchContent_MakeAvailable(yaml-cpp) +-endif() + ++if(BUILD_STREAM_CONVERTOR) ++ find_package(yaml-cpp) ++ if (NOT yaml-cpp_FOUND) ++ FetchContent_Declare( ++ yaml-cpp ++ GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git ++ GIT_TAG 0.8.0 ++ ) ++ FetchContent_MakeAvailable(yaml-cpp) ++ endif() ++endif() + + if(BUILD_TESTING) + enable_testing() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4d0e696..69652f3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,7 +1,7 @@ +-find_package(curl REQUIRED) +-find_package(openssl REQUIRED) ++find_package(CURL REQUIRED) ++find_package(OpenSSL REQUIRED) + find_package(aio REQUIRED) +-find_package(rapidjson REQUIRED) ++find_package(RapidJSON REQUIRED MODULE) + + link_libraries(rt pthread resolv) + +@@ -19,7 +19,7 @@ add_library(overlaybd_image_lib + target_include_directories(overlaybd_image_lib PUBLIC + ${CURL_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} +- ${rapidjson_SOURCE_DIR}/include ++ ${RAPIDJSON_INCLUDE_DIRS} + ${PHOTON_INCLUDE_DIR} + ) + +@@ -39,7 +39,7 @@ target_include_directories(overlaybd-tcmu PUBLIC + ${TCMU_INCLUDE_DIR} + ${CURL_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} +- ${rapidjson_SOURCE_DIR}/include ++ ${RAPIDJSON_INCLUDE_DIRS} + ${PHOTON_INCLUDE_DIR} + ) + target_link_libraries(overlaybd-tcmu +diff --git a/src/overlaybd/CMakeLists.txt b/src/overlaybd/CMakeLists.txt +index 1c5a912..af095b7 100644 +--- a/src/overlaybd/CMakeLists.txt ++++ b/src/overlaybd/CMakeLists.txt +@@ -6,7 +6,10 @@ add_subdirectory(cache) + add_subdirectory(tar) + add_subdirectory(gzip) + add_subdirectory(gzindex) +-add_subdirectory(stream_convertor) ++ ++if(BUILD_STREAM_CONVERTOR) ++ add_subdirectory(stream_convertor) ++endif() + + add_library(overlaybd_lib INTERFACE) + target_include_directories(overlaybd_lib INTERFACE +diff --git a/src/overlaybd/cache/ocf_cache/test/CMakeLists.txt b/src/overlaybd/cache/ocf_cache/test/CMakeLists.txt +index 6c629cc..9476e11 100644 +--- a/src/overlaybd/cache/ocf_cache/test/CMakeLists.txt ++++ b/src/overlaybd/cache/ocf_cache/test/CMakeLists.txt +@@ -1,7 +1,7 @@ + include_directories($ENV{GFLAGS}/include) + link_directories($ENV{GFLAGS}/lib) + +-find_package(curl REQUIRED) ++find_package(CURL REQUIRED) + + add_executable(ocf_perf_test ocf_perf_test.cpp) + target_include_directories( +diff --git a/src/overlaybd/registryfs/CMakeLists.txt b/src/overlaybd/registryfs/CMakeLists.txt +index 7ce30ab..a7f59e1 100644 +--- a/src/overlaybd/registryfs/CMakeLists.txt ++++ b/src/overlaybd/registryfs/CMakeLists.txt +@@ -1,10 +1,10 @@ + file(GLOB SOURCE_REGISTRYFS "*.cpp") + +-find_package(curl REQUIRED) ++find_package(CURL REQUIRED) + + add_library(registryfs_lib STATIC ${SOURCE_REGISTRYFS}) + target_include_directories(registryfs_lib PUBLIC + ${CURL_INCLUDE_DIRS} +- ${rapidjson_SOURCE_DIR}/include ++ ${RAPIDJSON_INCLUDE_DIRS} + ${PHOTON_INCLUDE_DIR} + ) +diff --git a/src/overlaybd/stream_convertor/CMakeLists.txt b/src/overlaybd/stream_convertor/CMakeLists.txt +index d0465e5..19f1acd 100644 +--- a/src/overlaybd/stream_convertor/CMakeLists.txt ++++ b/src/overlaybd/stream_convertor/CMakeLists.txt +@@ -3,7 +3,7 @@ file(GLOB SOURCE_SERV "*.cpp") + add_executable(overlaybd-streamConv ${SOURCE_SERV}) + target_include_directories(overlaybd-streamConv PUBLIC + ${PHOTON_INCLUDE_DIR} +- ${rapidjson_SOURCE_DIR}/include ++ ${RAPIDJSON_INCLUDE_DIRS} + ) + target_link_libraries(overlaybd-streamConv + photon_static +diff --git a/src/overlaybd/tar/erofs/test/CMakeLists.txt b/src/overlaybd/tar/erofs/test/CMakeLists.txt +index db03d8b..0c10f34 100644 +--- a/src/overlaybd/tar/erofs/test/CMakeLists.txt ++++ b/src/overlaybd/tar/erofs/test/CMakeLists.txt +@@ -12,7 +12,7 @@ target_link_libraries(erofs_simple_test gtest gtest_main pthread photon_static + + target_include_directories(erofs_simple_test PUBLIC + ${PHOTON_INCLUDE_DIR} +- ${rapidjson_SOURCE_DIR}/include ++ ${RAPIDJSON_INCLUDE_DIRS} + ) + + add_test( +@@ -28,7 +28,7 @@ target_link_libraries(erofs_stress_test gtest gtest_main pthread photon_static + + target_include_directories(erofs_stress_test PUBLIC + ${PHOTON_INCLUDE_DIR} +- ${rapidjson_SOURCE_DIR}/include ++ ${RAPIDJSON_INCLUDE_DIRS} + ) + + add_test( +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index f613a09..15336c9 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -7,7 +7,7 @@ link_directories($ENV{GTEST}/lib) + add_executable(image_service_test image_service_test.cpp) + target_include_directories(image_service_test PUBLIC + ${PHOTON_INCLUDE_DIR} +- ${rapidjson_SOURCE_DIR}/include ++ ${RAPIDJSON_INCLUDE_DIRS} + ) + target_link_libraries(image_service_test gtest gtest_main gflags pthread photon_static overlaybd_lib overlaybd_image_lib) + +@@ -34,14 +34,14 @@ gtest + + target_include_directories(simple_credsrv_test PUBLIC + ${PHOTON_INCLUDE_DIR} +- ${rapidjson_SOURCE_DIR}/include ++ ${RAPIDJSON_INCLUDE_DIRS} + $ENV{GTEST}/googletest/include + ) + + add_executable(trace_test trace_test.cpp ../tools/comm_func.cpp) + target_include_directories(trace_test PUBLIC + ${PHOTON_INCLUDE_DIR} +- ${rapidjson_SOURCE_DIR}/include ++ ${RAPIDJSON_INCLUDE_DIRS} + ) + target_link_libraries(trace_test gtest gtest_main gflags pthread photon_static overlaybd_lib overlaybd_image_lib) + +diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt +index b551b84..ecf5c32 100644 +--- a/src/tools/CMakeLists.txt ++++ b/src/tools/CMakeLists.txt +@@ -17,12 +17,12 @@ target_include_directories(overlaybd-zfile PUBLIC ${PHOTON_INCLUDE_DIR}) + target_link_libraries(overlaybd-zfile photon_static overlaybd_lib) + + add_executable(overlaybd-apply overlaybd-apply.cpp) +-target_include_directories(overlaybd-apply PUBLIC ${PHOTON_INCLUDE_DIR} ${rapidjson_SOURCE_DIR}/include) ++target_include_directories(overlaybd-apply PUBLIC ${PHOTON_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIRS}) + target_link_libraries(overlaybd-apply photon_static overlaybd_lib overlaybd_image_lib checksum_lib) + set_target_properties(overlaybd-apply PROPERTIES INSTALL_RPATH "/opt/overlaybd/lib") + + add_executable(turboOCI-apply turboOCI-apply.cpp) +-target_include_directories(turboOCI-apply PUBLIC ${PHOTON_INCLUDE_DIR} ${rapidjson_SOURCE_DIR}/include) ++target_include_directories(turboOCI-apply PUBLIC ${PHOTON_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIRS}) + target_link_libraries(turboOCI-apply photon_static overlaybd_lib overlaybd_image_lib) + set_target_properties(turboOCI-apply PROPERTIES INSTALL_RPATH "/opt/overlaybd/lib") + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/yaml-cpp-cmake-4.0.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/yaml-cpp-cmake-4.0.patch deleted file mode 100644 index 65bc465f0f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/yaml-cpp-cmake-4.0.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 10a573aa85db4eeb13df9e9cfa7047a0dc55d334 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= -Date: Mon, 24 Mar 2025 08:32:25 +0100 -Subject: [PATCH] [cmake] Require minimum CMake version 3.5 - -Soon CMake 4.0 will be released. It requires that projects -set a minimum required CMake version of 3.5. There is a -workaround with an additional flag, but it would is better -to increase the minimum required version. ---- - CMakeLists.txt | 5 +++-- - test/CMakeLists.txt | 1 - - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 46dc180..ee04e75 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,6 @@ --# 3.5 is actually available almost everywhere, but this a good minimum --cmake_minimum_required(VERSION 3.4) -+# 3.5 is actually available almost everywhere. -+# 3.30 as the upper policy limit avoids CMake deprecation warnings. -+cmake_minimum_required(VERSION 3.5...3.30) - - # enable MSVC_RUNTIME_LIBRARY target property - # see https://cmake.org/cmake/help/latest/policy/CMP0091.html -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 351b03f..210e629 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -2,7 +2,6 @@ find_package(Threads REQUIRED) - - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - set(BUILD_MOCK ON CACHE BOOL "" FORCE) --set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) - - add_subdirectory( - "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.11.0" --- -2.51.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/metadata.xml index 74fd16aaef..45f1aa97d4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/metadata.xml @@ -7,6 +7,7 @@ Accelerate CRC calculations with Intel Data Streaming Accelerator + Accelerate CRC calculations with Intel Intelligent Storage Acceleration Library Accelerate compression with Intel QuickAssist Technology diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild index 94e9e0e0ad..6845197f67 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild @@ -3,31 +3,39 @@ EAPI=8 -inherit cmake git-r3 systemd tmpfiles +inherit cmake systemd tmpfiles DESCRIPTION="Novel layering block-level image format for containers" HOMEPAGE="https://containerd.github.io/overlaybd" -EGIT_REPO_URI="https://github.com/containerd/overlaybd.git" if [[ ${PV} == 9999* ]]; then - KEYWORDS="~amd64 ~arm64" + EGIT_REPO_URI="https://github.com/containerd/overlaybd.git" + inherit git-r3 + RESTRICT="network-sandbox" else - EGIT_COMMIT="v${PV}" + EROFS_UTILS_COMMIT="eec6f7a2755dfccc8f655aa37cf6f26db9164e60" + PHOTON_COMMIT="v0.6.17" + TCMU_COMMIT="813fd65361bb2f348726b9c41478a44211847614" + OCF_COMMIT="c2dd2259e47c2e5e72dc77f99d0150a5d05496d7" + SRC_URI="https://github.com/containerd/overlaybd/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${EROFS_UTILS_COMMIT}.tar.gz + https://github.com/alibaba/PhotonLibOS/archive/${PHOTON_COMMIT}.tar.gz -> PhotonLibOS-${PHOTON_COMMIT}.tar.gz + https://github.com/data-accelerator/photon-libtcmu/archive/${TCMU_COMMIT}.tar.gz -> photon-libtcmu-${TCMU_COMMIT}.tar.gz + https://github.com/Open-CAS/ocf/archive/${OCF_COMMIT}.tar.gz -> ocf-${OCF_COMMIT}.tar.gz" KEYWORDS="amd64 arm64" fi LICENSE="Apache-2.0" SLOT="0" -IUSE="cpu_flags_x86_avx2 dsa qat isal" -REQUIRED_USE="dsa? ( cpu_flags_x86_avx2 )" -RESTRICT="test" +IUSE="cpu_flags_x86_avx2 cpu_flags_x86_avx512f dsa isal qat test" +REQUIRED_USE=" + dsa? ( cpu_flags_x86_avx2 ) + isal? ( cpu_flags_x86_avx512f ) +" +RESTRICT+=" test" # Mostly fails with operation not supported? +PROPERTIES="test_network" -# FIXME HACK ALERT: overlaybd build pulls sources during src_configure. -# (https://github.com/alibaba/PhotonLibOS.git/ -# This fails if network sandbox is enabled. -RESTRICT="${RESTRICT} network-sandbox" - -DEPEND=" +RDEPEND=" app-arch/zstd:= dev-libs/libaio dev-libs/libnl:3 @@ -38,38 +46,64 @@ DEPEND=" dsa? ( sys-apps/pciutils ) qat? ( sys-apps/pciutils ) " - -RDEPEND=" - ${DEPEND} +DEPEND=" + ${RDEPEND} + dev-libs/rapidjson + test? ( + dev-cpp/gflags + dev-cpp/gtest + ) +" +BDEPEND=" + virtual/pkgconfig " PATCHES=( "${FILESDIR}"/0001-Patch-Photon-after-fetching-to-fix-cross-issues.patch - "${FILESDIR}"/0002-Patch-yaml-cpp-after-fetching-to-fix-cmake-issues.patch + "${FILESDIR}"/${PN}-offline-build.patch ) src_prepare() { cmake_src_prepare - sed -i "s:@FILESDIR@:${FILESDIR}:g" CMakeLists.txt CMake/Findphoton.cmake || die + sed -i "s:@FILESDIR@:${FILESDIR}:g" CMake/Findphoton.cmake || die + + if [[ ${PV} != 9999* ]]; then + rmdir src/overlaybd/cache/ocf_cache/ocf || die + ln -sr "${WORKDIR}/ocf-${OCF_COMMIT#v}" src/overlaybd/cache/ocf_cache/ocf || die + + mkdir -p "${BUILD_DIR}"/_deps || die + cd "${BUILD_DIR}"/_deps || die + + ln -sr "${WORKDIR}/erofs-utils-${EROFS_UTILS_COMMIT}" erofs-utils-src || die + ln -sr "${WORKDIR}/PhotonLibOS-${PHOTON_COMMIT#v}" photon-src || die + ln -sr "${WORKDIR}/photon-libtcmu-${TCMU_COMMIT#v}" tcmu-src || die + + cd photon-src || die + eapply "${FILESDIR}"/photon-cross.patch + fi } src_configure() { # crc32c.cpp explicitly uses special instructions but checks for them at - # runtime. Only DSA hard requires at least AVX2. However, the code doesn't - # try especially hard to avoid these instructions from being implicitly used - # outside these runtime checks. :( - # ISAL similarly leads to "illegal instruction" termination on QEMU. + # runtime. However, the code doesn't try especially hard to avoid these + # instructions from being implicitly used outside these runtime checks. :( local mycmakeargs=( -DBUILD_SHARED_LIBS=no - -DBUILD_TESTING=no + -DBUILD_STREAM_CONVERTOR=no + -DBUILD_TESTING=$(usex test) -DENABLE_DSA=$(usex dsa) -DENABLE_ISAL=$(usex isal) -DENABLE_QAT=$(usex qat) -DORIGIN_EXT2FS=yes ) + # Ensure we're building offline. + [[ ${PV} == 9999* ]] || mycmakeargs+=( -DFETCHCONTENT_FULLY_DISCONNECTED=yes ) + # Make erofs-utils configure work when cross-compiling. + # Set dummy gflags/gtest dirs because they are in standard dirs anyway. host_alias="${CHOST}" build_alias="${CBUILD:-${CHOST}}" \ + GFLAGS=/no/where GTEST=/no/where \ cmake_src_configure }