From d589e7f04ea124b623f18f457892ca7f399db283 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Mon, 11 Jul 2022 10:53:51 -0400 Subject: [PATCH] scripts: move gen_relocate_app.py to scripts/build Move scripts needed by the build system and not designed to be run individually or standalone into the build subfolder. Signed-off-by: Anas Nashif --- CODEOWNERS | 2 +- MAINTAINERS.yml | 2 +- cmake/linker/arcmwdt/target.cmake | 2 +- cmake/linker/ld/target_relocation.cmake | 2 +- doc/build/cmake/index.rst | 4 ++-- scripts/{ => build}/gen_relocate_app.py | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename scripts/{ => build}/gen_relocate_app.py (100%) diff --git a/CODEOWNERS b/CODEOWNERS index 4a07b401a39..c7975e7d1d5 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -706,7 +706,7 @@ scripts/gen_image_info.py @tejlmand /scripts/gen_syscalls.py @dcpleung @nashif /scripts/list_boards.py @mbolivar-nordic /scripts/process_gperf.py @dcpleung @nashif -/scripts/gen_relocate_app.py @dcpleung +/scripts/build/gen_relocate_app.py @dcpleung /scripts/requirements*.txt @mbolivar-nordic @galak @nashif /scripts/tests/twister/ @aasthagr /scripts/tests/build/test_subfolder_list.py @rmstoi diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index e9b61014adb..f8f27a26a24 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -1975,7 +1975,7 @@ Userspace: - scripts/build/gen_kobject_list.py - scripts/gen_syscalls.py - scripts/process_gperf.py - - scripts/gen_relocate_app.py + - scripts/build/gen_relocate_app.py - include/zephyr/sys/kobject.h labels: - "area: Userspace" diff --git a/cmake/linker/arcmwdt/target.cmake b/cmake/linker/arcmwdt/target.cmake index ce9ee99ff42..3576dc2941a 100644 --- a/cmake/linker/arcmwdt/target.cmake +++ b/cmake/linker/arcmwdt/target.cmake @@ -211,7 +211,7 @@ macro(toolchain_ld_relocation) OUTPUT ${MEM_RELOCATION_CODE} ${MEM_RELOCATION_LD} COMMAND ${PYTHON_EXECUTABLE} - ${ZEPHYR_BASE}/scripts/gen_relocate_app.py + ${ZEPHYR_BASE}/scripts/build/gen_relocate_app.py $<$:--verbose> -d ${APPLICATION_BINARY_DIR} -i \"$\" diff --git a/cmake/linker/ld/target_relocation.cmake b/cmake/linker/ld/target_relocation.cmake index 68bca9c9e1c..60ff115efe2 100644 --- a/cmake/linker/ld/target_relocation.cmake +++ b/cmake/linker/ld/target_relocation.cmake @@ -14,7 +14,7 @@ macro(toolchain_ld_relocation) OUTPUT ${MEM_RELOCATION_CODE} ${MEM_RELOCATION_LD} COMMAND ${PYTHON_EXECUTABLE} - ${ZEPHYR_BASE}/scripts/gen_relocate_app.py + ${ZEPHYR_BASE}/scripts/build/gen_relocate_app.py $<$:--verbose> -d ${APPLICATION_BINARY_DIR} -i \"$\" diff --git a/doc/build/cmake/index.rst b/doc/build/cmake/index.rst index fa8d7fdfdcc..9ad33374ff5 100644 --- a/doc/build/cmake/index.rst +++ b/doc/build/cmake/index.rst @@ -393,10 +393,10 @@ The following is a detailed description of the scripts used during the build pro .. _gen_relocate_app.py: -:zephyr_file:`scripts/gen_relocate_app.py` +:zephyr_file:`scripts/build/gen_relocate_app.py` ------------------------------------------- -.. include:: ../../../scripts/gen_relocate_app.py +.. include:: ../../../scripts/build/gen_relocate_app.py :start-after: """ :end-before: """ diff --git a/scripts/gen_relocate_app.py b/scripts/build/gen_relocate_app.py similarity index 100% rename from scripts/gen_relocate_app.py rename to scripts/build/gen_relocate_app.py