Merge pull request #302 from yuchen0cc/main

untar: support pax xattr header

CMake/Finde2fs.cmake

@@ -0,0 +1,43 @@
+if(NOT ORIGIN_EXT2FS)
+    message("Add and build standalone libext2fs")
+    include(FetchContent)
+    FetchContent_Declare(
+        e2fsprogs
+        GIT_REPOSITORY https://github.com/data-accelerator/e2fsprogs.git
+        GIT_TAG f8664ddfd662b1664104e0bbd5ac202a6e3b1da6
+    )
+    FetchContent_GetProperties(e2fsprogs)
+
+    if(NOT TARGET libext2fs_build)
+        if (NOT e2fsprogs_POPULATED)
+            FetchContent_Populate(e2fsprogs)
+        endif()
+        set(LIBEXT2FS_INSTALL_DIR ${e2fsprogs_SOURCE_DIR}/build/libext2fs CACHE STRING "")
+
+        add_custom_command(
+            OUTPUT ${LIBEXT2FS_INSTALL_DIR}/lib
+            WORKING_DIRECTORY ${e2fsprogs_SOURCE_DIR}
+            COMMAND chmod 755 build.sh && ./build.sh
+        )
+        add_custom_target(libext2fs_build DEPENDS ${LIBEXT2FS_INSTALL_DIR}/lib)
+    endif()
+
+    set(E2FS_FOUND yes)
+    set(E2FS_LIBRARY ${LIBEXT2FS_INSTALL_DIR}/lib/libext2fs.so)
+    set(E2FS_LIBRARIES ${E2FS_LIBRARY})
+    set(E2FS_INCLUDE_DIR ${LIBEXT2FS_INSTALL_DIR}/include)
+    set(E2FS_INCLUDE_DIRS ${E2FS_INCLUDE_DIR})
+
+    if(NOT TARGET libext2fs)
+        add_library(libext2fs UNKNOWN IMPORTED)
+    endif()
+    add_dependencies(libext2fs libext2fs_build)
+
+else()
+    find_path(E2FS_INCLUDE_DIRS ext2fs/ext2fs.h)
+    find_library(E2FS_LIBRARIES ext2fs)
+endif()
+
+find_package_handle_standard_args(e2fs DEFAULT_MSG E2FS_LIBRARIES E2FS_INCLUDE_DIRS)
+
+mark_as_advanced(E2FS_INCLUDE_DIRS E2FS_LIBRARIES)

CMake/Findphoton.cmake

@@ -1,10 +1,11 @@
 include(FetchContent)
 set(FETCHCONTENT_QUIET false)
+set(PHOTON_ENABLE_EXTFS ON)
 
 FetchContent_Declare(
   photon
   GIT_REPOSITORY https://github.com/alibaba/PhotonLibOS.git
-  GIT_TAG v0.6.13
+  GIT_TAG v0.6.14
 )
 
 if(BUILD_TESTING)
@@ -21,4 +22,8 @@ if (BUILD_CURL_FROM_SOURCE)
   add_dependencies(photon_obj CURL::libcurl OpenSSL::SSL OpenSSL::Crypto)
 endif()
 
+if(NOT ORIGIN_EXT2FS)
+  add_dependencies(photon_obj libext2fs)
+endif()
+
 set(PHOTON_INCLUDE_DIR ${photon_SOURCE_DIR}/include/)

CMakeLists.txt

@@ -40,6 +40,7 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED on)
 set(ENABLE_MIMIC_VDSO off)
 option(BUILD_CURL_FROM_SOURCE "Compile static libcurl" off)
+option(ORIGIN_EXT2FS "Use original libext2fs" off)
 find_package(photon REQUIRED)
 find_package(tcmu REQUIRED)
 find_package(yamlcpp)

src/CMakeLists.txt

@@ -56,8 +56,11 @@ install(TARGETS overlaybd-tcmu DESTINATION /opt/overlaybd/bin)
 install(FILES example_config/overlaybd-tcmu.service DESTINATION /opt/overlaybd/)
 install(FILES example_config/overlaybd.json DESTINATION /etc/overlaybd/)
 install(FILES example_config/cred.json DESTINATION /opt/overlaybd/)
+if (NOT ORIGIN_EXT2FS)
+    install(DIRECTORY ${LIBEXT2FS_INSTALL_DIR}/lib DESTINATION /opt/overlaybd/ USE_SOURCE_PERMISSIONS)
+endif()
 
 add_subdirectory(tools)
 if (BUILD_TESTING)
     add_subdirectory(test)
-endif ()
+endif ()

src/overlaybd/CMakeLists.txt

@@ -3,7 +3,6 @@ add_subdirectory(lsmt)
 add_subdirectory(zfile)
 add_subdirectory(cache)
 add_subdirectory(tar)
-add_subdirectory(extfs)
 add_subdirectory(gzip)
 add_subdirectory(gzindex)
 add_subdirectory(stream_convertor)
@@ -19,7 +18,6 @@ target_link_libraries(overlaybd_lib INTERFACE
     zfile_lib
     cache_lib
     tar_lib
-    extfs_lib
     gzip_lib
     gzindex_lib
 )