mirror of
https://github.com/reactos/reactos.git
synced 2024-09-29 05:54:05 +00:00
[0.4.9][CMAKE][BOOTDATA] Fix LiveCD does not import caroots.inf into registry CORE-17739 CORE-17735 (#3930)
It regressed by 0.4.9-dev-82-g6158207c31
fix picked from 0.4.15-dev-3082-g2268b33e18
This commit is contained in:
parent
8900a74e2c
commit
61fa5ea598
|
@ -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
|
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"
|
COMMAND native-utf16le "${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf" "${CMAKE_CURRENT_BINARY_DIR}/caroots.inf"
|
||||||
DEPENDS native-utf16le ${CMAKE_CURRENT_SOURCE_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(
|
add_registry_inf(
|
||||||
hivecls.inf
|
hivecls.inf
|
||||||
|
|
|
@ -803,6 +803,7 @@ function(create_registry_hives)
|
||||||
list(APPEND _livecd_inf_files
|
list(APPEND _livecd_inf_files
|
||||||
${_registry_inf}
|
${_registry_inf}
|
||||||
${CMAKE_SOURCE_DIR}/boot/bootdata/livecd.inf
|
${CMAKE_SOURCE_DIR}/boot/bootdata/livecd.inf
|
||||||
|
${CMAKE_SOURCE_DIR}/boot/bootdata/caroots.inf
|
||||||
${CMAKE_SOURCE_DIR}/boot/bootdata/hiveinst.inf)
|
${CMAKE_SOURCE_DIR}/boot/bootdata/hiveinst.inf)
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
|
|
Loading…
Reference in a new issue