From 3c1d046fdee9e3619103cd5c18f449058709b24a Mon Sep 17 00:00:00 2001
From: Julio Carchi <julcar@informaticos.com>
Date: Mon, 30 Aug 2021 06:07:12 -0500
Subject: [PATCH] [0.4.14][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

fix picked from 0.4.15-dev-3082-g 2268b33e18c41d29e95fd73e53f264354d5e152f)
---
 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 fd5696b46fe..b4c10552514 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 a3be90baa74..0a41c987675 100644
--- a/sdk/cmake/CMakeMacros.cmake
+++ b/sdk/cmake/CMakeMacros.cmake
@@ -855,7 +855,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)