From 13758417c53ce9c3da18c34426e66e78139a6c21 Mon Sep 17 00:00:00 2001 From: Balazs Gerofi Date: Tue, 26 Mar 2019 08:38:49 +0000 Subject: [PATCH] Make boot scripts arch independent and move them to scripts Change-Id: I3f4c3e366b325df17208a41d5f842c1a2a888494 --- CMakeLists.txt | 6 +++--- .../mcreboot-smp-x86.sh.in => scripts/mcreboot-smp.sh.in | 0 {arch/x86_64/tools => scripts}/mcreboot.1in | 0 .../mcstop+release-smp.sh.in | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename arch/x86_64/tools/mcreboot-smp-x86.sh.in => scripts/mcreboot-smp.sh.in (100%) rename {arch/x86_64/tools => scripts}/mcreboot.1in (100%) rename arch/x86_64/tools/mcstop+release-smp-x86.sh.in => scripts/mcstop+release-smp.sh.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85432f35..d0392147 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,9 +145,9 @@ add_subdirectory(executer/user) add_subdirectory(kernel) add_subdirectory(tools/mcstat) -configure_file(arch/x86_64/tools/mcreboot-smp-x86.sh.in mcreboot.sh @ONLY) -configure_file(arch/x86_64/tools/mcstop+release-smp-x86.sh.in mcstop+release.sh @ONLY) -configure_file(arch/x86_64/tools/mcreboot.1in mcreboot.1 @ONLY) +configure_file(scripts/mcreboot-smp.sh.in mcreboot.sh @ONLY) +configure_file(scripts/mcstop+release-smp.sh.in mcstop+release.sh @ONLY) +configure_file(scripts/mcreboot.1in mcreboot.1 @ONLY) install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/mcreboot.sh" "${CMAKE_CURRENT_BINARY_DIR}/mcstop+release.sh" diff --git a/arch/x86_64/tools/mcreboot-smp-x86.sh.in b/scripts/mcreboot-smp.sh.in similarity index 100% rename from arch/x86_64/tools/mcreboot-smp-x86.sh.in rename to scripts/mcreboot-smp.sh.in diff --git a/arch/x86_64/tools/mcreboot.1in b/scripts/mcreboot.1in similarity index 100% rename from arch/x86_64/tools/mcreboot.1in rename to scripts/mcreboot.1in diff --git a/arch/x86_64/tools/mcstop+release-smp-x86.sh.in b/scripts/mcstop+release-smp.sh.in similarity index 100% rename from arch/x86_64/tools/mcstop+release-smp-x86.sh.in rename to scripts/mcstop+release-smp.sh.in