~aleteoryx/muditaos: [EGD-7402] Cmake changes to download Updater

7 files changed, 3 insertions(+), 43 deletions(-)

M CMakeLists.txt
M cmake/modules/AddPackage.cmake
D cmake/modules/AddPureUpdater.cmake
M cmake/modules/AddVersionJson.cmake
M cmake/modules/DiskImage.cmake
D image/PureUpdater.version
D image/PureUpdater_RT.bin

M CMakeLists.txt => CMakeLists.txt +2 -3

@@ 24,7 24,7 @@ include(CopyGdbInit)
 include(Utils)
 include(ModuleUtils)
 include(FetchBootloader)
-include(AddPureUpdater)
+include(FetchPureUpdater)
 include(DiskImage)
 include(AddPackage)
 


@@ 158,8 158,7 @@ add_custom_target(
         "Generating version info"
     )
 
-copy_updater_bin()
-copy_updater_ver()
 fetch_ecoboot()
+fetch_updater()
 
 add_subdirectory(products)

M cmake/modules/AddPackage.cmake => cmake/modules/AddPackage.cmake +0 -2

@@ 41,7 41,6 @@ function(add_standalone_image SOURCE_TARGET)
         DEPENDS ${BIN_FILE}
         DEPENDS ecoboot.bin-target
         DEPENDS updater.bin-target
-        DEPENDS updater.ver-target
         DEPENDS ${SOURCE_TARGET}-version.json-target
         DEPENDS ${SOURCE_TARGET}.img
         )


@@ 70,7 69,6 @@ function(add_update_package SOURCE_TARGET)
         DEPENDS ${SOURCE_TARGET}-version.json-target
         DEPENDS ecoboot.bin-target
         DEPENDS updater.bin-target
-        DEPENDS updater.ver-target
         DEPENDS assets
         COMMAND ${CMAKE_SOURCE_DIR}/tools/generate_update_image.sh ${SOURCE_TARGET} ${CMAKE_PROJECT_VERSION} ${CPACK_SYSTEM_NAME}
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}

D cmake/modules/AddPureUpdater.cmake => cmake/modules/AddPureUpdater.cmake +0 -34

@@ 1,34 0,0 @@
-function(copy_updater_bin)
-    set(ASSETS_SOURCE_DIR ${CMAKE_SOURCE_DIR}/image)
-    set(UPDATER_ASSET_BIN PureUpdater_RT.bin)
-
-    add_custom_command(OUTPUT updater.bin
-        COMMAND cp
-            ${ASSETS_SOURCE_DIR}/${UPDATER_ASSET_BIN}
-            ${CMAKE_BINARY_DIR}/updater.bin
-        COMMENT "Copying PureUpdater_RT.bin"
-    )
-
-    add_custom_target(updater.bin-target DEPENDS updater.bin)
-
-    multicomp_install(PROGRAMS ${CMAKE_BINARY_DIR}/updater.bin DESTINATION "./"
-        COMPONENTS Standalone Update)
-endfunction()
-
-
-function(copy_updater_ver)
-    set(ASSETS_SOURCE_DIR ${CMAKE_SOURCE_DIR}/image)
-    set(UPDATER_ASSET_VER PureUpdater.version)
-
-    add_custom_command(OUTPUT PureUpdater.version
-        COMMAND cp
-            ${ASSETS_SOURCE_DIR}/${UPDATER_ASSET_VER}
-            ${CMAKE_BINARY_DIR}/PureUpdater.version
-        COMMENT "Downloading PureUpdater.version"
-    )
-
-    add_custom_target(updater.ver-target DEPENDS PureUpdater.version)
-
-    multicomp_install(PROGRAMS ${CMAKE_BINARY_DIR}/PureUpdater.version DESTINATION "./"
-        COMPONENTS Standalone Update)
-endfunction()

M cmake/modules/AddVersionJson.cmake => cmake/modules/AddVersionJson.cmake +0 -1

@@ 17,7 17,6 @@ function(add_version_json SOURCE_TARGET)
             -P ${CMAKE_SOURCE_DIR}/cmake/modules/ConfigureVersionJson.cmake
         DEPENDS ecoboot.bin-target
         DEPENDS updater.bin-target
-        DEPENDS updater.ver-target
         DEPENDS ${SOURCE_TARGET}-boot.bin
     )

M cmake/modules/DiskImage.cmake => cmake/modules/DiskImage.cmake +1 -1

@@ 45,7 45,7 @@ function(add_image)
     endif()
 
     if(HAS_UPDATER)
-        list(APPEND COMMAND_DEPENDS updater.bin-target updater.ver-target)
+        list(APPEND COMMAND_DEPENDS updater.bin-target)
     endif()
 
     add_custom_command(

D image/PureUpdater.version => image/PureUpdater.version +0 -2

@@ 1,2 0,0 @@
-0.0.3
-

D image/PureUpdater_RT.bin => image/PureUpdater_RT.bin +0 -0