[ros-diffs] [reactos] 01/01: [CMAKE][BOOTDATA] Fix LiveCD does not import caroots.inf into registry CORE-17739 CORE-17735 (#3930)

[Julio Carchi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2268b33e18c41d29e95fd…

commit 2268b33e18c41d29e95fd73e53f264354d5e152f
Author:     Julio Carchi <julcar(a)informaticos.com>
AuthorDate: Mon Aug 30 06:07:12 2021 -0500
Commit:     GitHub <noreply(a)github.com>
CommitDate: Mon Aug 30 13:07:12 2021 +0200

    [CMAKE][BOOTDATA] Fix LiveCD does not import caroots.inf into registry CORE-17739
CORE-17735 (#3930)
    
    It regressed by 0.4.9-dev-82-g 6158207c318bccaf1767d1a5c1545de45beb113d
    
    KVM https://reactos.org/testman/compare.php?ids=78729,78730 LGTM
    VBox https://reactos.org/testman/compare.php?ids=78728,78731 LGTM
---
 boot/bootdata/CMakeLists.txt | 2 +-
 sdk/cmake/CMakeMacros.cmake  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/boot/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt
index 30ebc713b4c..95a4382e58c 100644
--- a/boot/bootdata/CMakeLists.txt
+++ b/boot/bootdata/CMakeLists.txt
@@ -9,7 +9,7 @@ add_custom_target(converted_caroots_inf DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/caro
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf
                    COMMAND native-utf16le
"${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf"
"${CMAKE_CURRENT_BINARY_DIR}/caroots.inf"
                    DEPENDS native-utf16le ${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf)
-add_cd_file(TARGET converted_caroots_inf FILE ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf
DESTINATION reactos NO_CAB FOR all)
+add_cd_file(TARGET converted_caroots_inf FILE ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf
DESTINATION reactos NO_CAB FOR bootcd regtest)
 
 add_registry_inf(
     hivecls.inf
diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake
index 54856d8d357..f254ce3f054 100644
--- a/sdk/cmake/CMakeMacros.cmake
+++ b/sdk/cmake/CMakeMacros.cmake
@@ -794,7 +794,8 @@ function(create_registry_hives)
     # LiveCD hives
     list(APPEND _livecd_inf_files
         ${_registry_inf}
-        ${CMAKE_SOURCE_DIR}/boot/bootdata/livecd.inf)
+        ${CMAKE_SOURCE_DIR}/boot/bootdata/livecd.inf
+        ${CMAKE_SOURCE_DIR}/boot/bootdata/caroots.inf)
     if(SARCH STREQUAL "xbox")
         list(APPEND _livecd_inf_files
             ${CMAKE_SOURCE_DIR}/boot/bootdata/hiveinst_xbox.inf)