diff --git a/CMakeLists.txt b/CMakeLists.txt index 7abd5e8f..8f0d4edf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,8 +45,8 @@ set(ULPATCH_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/ulpatch/) set(ULPATCH_SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/ulpatch/) # see src/patch/objects/ftrace/CMakeLists.txt set(FTRACE_MCOUNT_OBJ ftrace-mcount.obj) -# see src/patch/objects/ulpatch-hello/CMakeLists.txt -set(ULPATCH_HELLO_OBJ ulpatch-hello.obj) +# see src/patch/objects/hello/CMakeLists.txt +set(ULPATCH_HELLO_OBJ hello.obj) # check processor architecture # only support x86_64 and aarch64 right now. @@ -121,7 +121,7 @@ endif() # macro ULPATCH_FTRACE_OBJ_PATH="/usr/share/ulpatch/ftrace-mcount.obj" for example set(UTILS_FLAGS "${UTILS_FLAGS}" ULPATCH_FTRACE_OBJ_PATH="${ULPATCH_SHARE_DIR}${FTRACE_MCOUNT_OBJ}") -# macro ULPATCH_HELLO_OBJ_PATH="/usr/share/ulpatch/ulpatch-hello.obj" for example +# macro ULPATCH_HELLO_OBJ_PATH="/usr/share/ulpatch/hello.obj" for example set(UTILS_FLAGS "${UTILS_FLAGS}" ULPATCH_HELLO_OBJ_PATH="${ULPATCH_SHARE_DIR}${ULPATCH_HELLO_OBJ}") @@ -155,7 +155,7 @@ DESTINATION ${ULPATCH_INCLUDE_DIR} install( PROGRAMS ${PROJECT_SOURCE_DIR}/src/patch/objects/ftrace/${FTRACE_MCOUNT_OBJ} - ${PROJECT_SOURCE_DIR}/src/patch/objects/ulpatch-hello/${ULPATCH_HELLO_OBJ} + ${PROJECT_SOURCE_DIR}/src/patch/objects/hello/${ULPATCH_HELLO_OBJ} DESTINATION ${ULPATCH_SHARE_DIR} ) diff --git a/src/patch/objects/CMakeLists.txt b/src/patch/objects/CMakeLists.txt index 3ba515cb..47485df8 100644 --- a/src/patch/objects/CMakeLists.txt +++ b/src/patch/objects/CMakeLists.txt @@ -2,5 +2,5 @@ # Copyright (C) 2022-2024 Rong Tao # add_subdirectory(ftrace) -add_subdirectory(ulpatch-hello) +add_subdirectory(hello) diff --git a/src/patch/objects/ulpatch-hello/CMakeLists.txt b/src/patch/objects/hello/CMakeLists.txt similarity index 87% rename from src/patch/objects/ulpatch-hello/CMakeLists.txt rename to src/patch/objects/hello/CMakeLists.txt index 32ce8492..5ef45f67 100644 --- a/src/patch/objects/ulpatch-hello/CMakeLists.txt +++ b/src/patch/objects/hello/CMakeLists.txt @@ -23,13 +23,13 @@ target_compile_definitions(${ULPATCH_OBJ_TARGET} PRIVATE ULPATCH_TEST ) -set(ULPATCH_HELLO_OBJ ulpatch-hello.obj) +set(ULPATCH_HELLO_OBJ hello.obj) set(make_include ${PROJECT_SOURCE_DIR}/src/) message(STATUS "=== Compile ulpatch hello object ${make_include}") add_custom_command( TARGET ${ULPATCH_OBJ_TARGET} COMMAND make INCS1="-I${make_include}" FTRACE_OBJ=${ULPATCH_HELLO_OBJ} - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/patch/objects/ulpatch-hello + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/patch/objects/hello ) diff --git a/src/patch/objects/ulpatch-hello/Makefile b/src/patch/objects/hello/Makefile similarity index 95% rename from src/patch/objects/ulpatch-hello/Makefile rename to src/patch/objects/hello/Makefile index 36e6dc85..77d0ec4b 100644 --- a/src/patch/objects/ulpatch-hello/Makefile +++ b/src/patch/objects/hello/Makefile @@ -4,7 +4,7 @@ ifdef ULPATCH_HELLO_OBJ TARGETS = $(ULPATCH_HELLO_OBJ) else -TARGETS = ulpatch-hello.obj +TARGETS = hello.obj endif CC = gcc diff --git a/src/patch/objects/ulpatch-hello/README.md b/src/patch/objects/hello/README.md similarity index 100% rename from src/patch/objects/ulpatch-hello/README.md rename to src/patch/objects/hello/README.md diff --git a/src/patch/objects/ulpatch-hello/hello.c b/src/patch/objects/hello/hello.c similarity index 100% rename from src/patch/objects/ulpatch-hello/hello.c rename to src/patch/objects/hello/hello.c diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 5f34fee9..68ee87e3 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -19,7 +19,7 @@ aux_source_directory(. DIR_SRCS) aux_source_directory(arch DIR_ARCH_SRCS) aux_source_directory(elf DIR_ELF_SRCS) aux_source_directory(patch DIR_PATCH_SRCS) -aux_source_directory(patch/object/ulpatch-hello/ DIR_PATCH_OBJ_HELLO_SRCS) +aux_source_directory(patch/object/hello/ DIR_PATCH_OBJ_HELLO_SRCS) aux_source_directory(utils DIR_UTILS_SRCS) add_executable(ulpatch_test diff --git a/src/tests/patch/object.c b/src/tests/patch/object.c index b03cf33d..356f7333 100644 --- a/src/tests/patch/object.c +++ b/src/tests/patch/object.c @@ -18,7 +18,7 @@ static const struct ulpatch_object { } ulpatch_objs[] = { /* /usr/share/ulpatch/ftrace-mcount.obj */ {ULPATCH_FTRACE_OBJ_PATH}, - /* /usr/share/ulpatch/ulpatch-hello.obj */ + /* /usr/share/ulpatch/hello.obj */ {ULPATCH_HELLO_OBJ_PATH}, }; diff --git a/src/tests/patch/object/ulpatch-hello/hello.c b/src/tests/patch/object/hello/hello.c similarity index 94% rename from src/tests/patch/object/ulpatch-hello/hello.c rename to src/tests/patch/object/hello/hello.c index c4331de2..1b268143 100644 --- a/src/tests/patch/object/ulpatch-hello/hello.c +++ b/src/tests/patch/object/hello/hello.c @@ -13,7 +13,7 @@ /** * This is target function to patch, the patch object see - * src/patch/objects/ulpatch-hello/ + * src/patch/objects/hello/ */ void hello_world(void) { diff --git a/tests/hello/test.sh b/tests/hello/test.sh index aa481b81..e8b1472f 100755 --- a/tests/hello/test.sh +++ b/tests/hello/test.sh @@ -31,7 +31,7 @@ TEMP=$(getopt \ --long error \ --long verbose \ --long help \ - -n ulpatch-hello-test -- "$@") + -n ulpatch-tests-hello -- "$@") test $? != 0 && __usage__ 1 diff --git a/ulpatch.spec b/ulpatch.spec index 7b2d9bc7..6ad2a76f 100644 --- a/ulpatch.spec +++ b/ulpatch.spec @@ -93,7 +93,7 @@ popd %{_mandir}/man8/ulpinfo.8.gz %{_mandir}/man8/ultask.8.gz %{_datadir}/ulpatch/ftrace-mcount.obj -%{_datadir}/ulpatch/ulpatch-hello.obj +%{_datadir}/ulpatch/hello.obj %files devel %{_includedir}/ulpatch/meta.h