From fa53bff60cfa26366d19c6c6fbcd45bd392a3420 Mon Sep 17 00:00:00 2001 From: Trung Nguyen <57174311+trungnt2910@users.noreply.github.com> Date: Tue, 5 Mar 2024 12:43:41 +0000 Subject: [PATCH] chore: Disable "hyclonefs" These were tools based on Haiku's `fs_shell`. There used to be plans to integrate `fs_shell` to `hyclone_server` to serve as a VFS layer, but that proved to be too much runtime overhead and complexity compared to a simple "path translation" scheme. --- CMakeLists.txt | 2 -- copy_objects.sh | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca2538a..6072a56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,5 @@ add_subdirectory(libroot) add_subdirectory(runtime_loader) add_subdirectory(libhpkg) add_subdirectory(hpkgvfs_analyze) -add_subdirectory(libhyclonefs) -add_subdirectory(hyclonefs_analyze) add_subdirectory(haiku_loader) add_subdirectory(hyclone_server) diff --git a/copy_objects.sh b/copy_objects.sh index 0e89bb2..ac2668f 100755 --- a/copy_objects.sh +++ b/copy_objects.sh @@ -73,6 +73,4 @@ cp -fpv $HAIKU_GLUE_GCC/crtbeginS.o $SCRIPT_DIR/libroot cp -fpv $HAIKU_GLUE_GCC/crtendS.o $SCRIPT_DIR/libroot cp -fpv $HAIKU_BUILD_SOURCE_DIRECTORY/src/tools/fs_shell/*.h $SCRIPT_DIR/libhyclonefs/haiku_include/fs_shell cp -fpv $HAIKU_BUILD_SOURCE_DIRECTORY/headers/private/fs_shell/*.h $SCRIPT_DIR/libhyclonefs/haiku_include/private/fs_shell -cp -fpv $HAIKU_BUILD_OUTPUT_ROOT/objects/$(uname | tr '[:upper:]' '[:lower:]')/$(uname -m)/release/tools/fs_shell/*.o $SCRIPT_DIR/libhyclonefs/fs_shell -cp -fpv $HAIKU_BUILD_OUTPUT_ROOT/objects/$(uname | tr '[:upper:]' '[:lower:]')/$(uname -m)/release/build/libroot/*.o $SCRIPT_DIR/libhyclonefs/libroot_host -cp -fpv $HAIKU_BUILD_OUTPUT_ROOT/objects/haiku/$HAIKU_ARCH/release/system/kernel/syscalls.o $SCRIPT_DIR/monika/dispatcher/syscalls.o \ No newline at end of file +cp -fpv $HAIKU_BUILD_OUTPUT_ROOT/objects/haiku/$HAIKU_ARCH/release/system/kernel/syscalls.o $SCRIPT_DIR/monika/dispatcher/syscalls.o