From 015a64039d53d2e2df6bba412594e7b79fda6ab1 Mon Sep 17 00:00:00 2001 From: CGH0S7 <776459475@qq.com> Date: Fri, 22 Aug 2025 22:02:50 +0800 Subject: [PATCH] Try to port mckernel to rhel9 --- CMakeLists.txt | 10 ++++++---- executer/user/lib/CMakeLists.txt | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c008a705..8b96f14a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,7 +84,8 @@ if(ENABLE_FUGAKU_HACKS) endif() # Fujitsu MPI tries to xpmem-attach segment with size of range size + 1? -set(FJMPI_VERSION_COMMAND "a=\$(which mpifcc); b=\${a%/*/*}; c=\${b##*/}; d=\${c#*-}; echo \$d") +#set(FJMPI_VERSION_COMMAND "a=\$(which mpifcc); b=\${a%/*/*}; c=\${b##*/}; d=\${c#*-}; echo \$d") +set(FJMPI_VERSION_COMMAND "a=\$(which mpifort); b=\${a%/*/*}; c=\${b##*/}; d=\${c#*-}; echo \$d") execute_process(COMMAND bash -c "${FJMPI_VERSION_COMMAND}" OUTPUT_VARIABLE FJMPI_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) message("FJMPI_VERSION: ${FJMPI_VERSION}") @@ -191,6 +192,7 @@ file(REMOVE_RECURSE ${tmpdir}) file(MAKE_DIRECTORY ${tmpdir}) file(WRITE ${tmpdir}/driver.c "#include \n") file(APPEND ${tmpdir}/driver.c "unsigned long MAP_KERNEL_START = MODULES_END - (1UL << 23);\n") +file(APPEND ${tmpdir}/driver.c "MODULE_LICENSE(\"GPL\");\n") file(WRITE ${tmpdir}/Makefile "obj-m := driver.o\n") file(APPEND ${tmpdir}/Makefile "all:\n") file(APPEND ${tmpdir}/Makefile "\tmake ${KBUILD_MAKE_FLAGS_STR} -C ${KERNEL_DIR} M=${tmpdir} modules\n") @@ -276,11 +278,11 @@ set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # ihk: ultimately should support extrnal build, but add as subproject for now if (EXISTS ${PROJECT_SOURCE_DIR}/ihk/CMakeLists.txt) - set(IHK_SOURCE_DIR "ihk" CACHE STRINGS "path to ihk source directory from mckernel sources") + set(IHK_SOURCE_DIR "ihk" CACHE STRING "path to ihk source directory from mckernel sources") elseif (EXISTS ${PROJECT_SOURCE_DIR}/../ihk/CMakeLists.txt) - set(IHK_SOURCE_DIR "../ihk" CACHE STRINGS "path to ihk source directory from mckernel sources") + set(IHK_SOURCE_DIR "../ihk" CACHE STRING "path to ihk source directory from mckernel sources") else() - set(IHK_SOURCE_DIR "ihk" CACHE STRINGS "path to ihk source directory from mckernel sources") + set(IHK_SOURCE_DIR "ihk" CACHE STRING "path to ihk source directory from mckernel sources") endif() if (EXISTS ${PROJECT_SOURCE_DIR}/${IHK_SOURCE_DIR}/CMakeLists.txt) set(IHK_FULL_SOURCE_DIR ${PROJECT_SOURCE_DIR}/${IHK_SOURCE_DIR}) diff --git a/executer/user/lib/CMakeLists.txt b/executer/user/lib/CMakeLists.txt index ac1e1ca3..2e40446a 100644 --- a/executer/user/lib/CMakeLists.txt +++ b/executer/user/lib/CMakeLists.txt @@ -4,9 +4,9 @@ endif() if (ENABLE_UTI) if (${ARCH} STREQUAL "arm64") - set(SYSCALL_INTERCEPT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/syscall_intercept/arch/aarch64" CACHE STRINGS "relative path to syscalL_intercept source directory") + set(SYSCALL_INTERCEPT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/syscall_intercept/arch/aarch64" CACHE STRING "relative path to syscalL_intercept source directory") elseif (${ARCH} STREQUAL "x86_64") - set(SYSCALL_INTERCEPT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/syscall_intercept" CACHE STRINGS "relative path to syscalL_intercept source directory") + set(SYSCALL_INTERCEPT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/syscall_intercept" CACHE STRING "relative path to syscalL_intercept source directory") endif()