From c5baf39b51f8c6c927ce8266463ad4f3ea443996 Mon Sep 17 00:00:00 2001
From: Radoslaw Wicik <radoslaw.wicik@mudita.com>
Date: Wed, 24 Feb 2021 11:41:09 +0100
Subject: [PATCH] [EGD-5860] Fix build packages

Error introduced by merge, fixed paths and dependences.
---
 CMakeLists.txt                           | 25 ++++++++++++++++--------
 cmake/modules/GenUpdateVersionJson.cmake |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f573791ea2db3aab49b6bcfbb6e0b35b4cf3687c..e63035669003195c23fd7172db341e5c49d2553c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,7 +312,7 @@ if (${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
         -DSRC_DIR=${CMAKE_SOURCE_DIR}
         -DECOBOOT_DOWNLOAD_LOG=${ECOBOOT_DOWNLOAD_LOG}
         -B ${CMAKE_BINARY_DIR}
-        -P ${CMAKE_SOURCE_DIR}/config/GenUpdateVersionJson.cmake
+        -P ${CMAKE_SOURCE_DIR}/cmake/modules/GenUpdateVersionJson.cmake
         DEPENDS ecoboot.bin ${ECOBOOT_DOWNLOAD_LOG}
         )
 
@@ -420,11 +420,20 @@ set(PACKAGE_STAGING_DIRECTORY ${CMAKE_BINARY_DIR}/_CPack_Packages/${CPACK_TOPLEV
 
 include(CPack)
 
-add_custom_target(package-standalone-staged
-    COMMAND ${CMAKE_CPACK_COMMAND}
-    -C $<CONFIGURATION>
-    --config ${CPACK_OUTPUT_CONFIG_FILE}
+if (${PROJECT_TARGET} STREQUAL "TARGET_Linux")
+    add_custom_target(package-standalone-staged
+        COMMAND ${CMAKE_CPACK_COMMAND}
+        -C $<CONFIGURATION>
+        --config ${CPACK_OUTPUT_CONFIG_FILE}
+    )
+else()
+    add_custom_target(package-standalone-staged
+        COMMAND ${CMAKE_CPACK_COMMAND}
+        -C $<CONFIGURATION>
+        --config ${CPACK_OUTPUT_CONFIG_FILE}
+        DEPENDS ${BIN_FILE}-target ecoboot.bin version.json
     )
+endif()
 
 if (${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
     set(PACKAGE_STANDALONE_FILE_NAME ${PACKAGE_COMMON_NAME}-Standalone.zip)
@@ -433,12 +442,12 @@ if (${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
         COMMAND ${CMAKE_CPACK_COMMAND}
         -C $<CONFIGURATION>
         --config ${CPACK_OUTPUT_CONFIG_FILE}
-        DEPENDS ecoboot.bin version.json
+        DEPENDS ${BIN_FILE}-target ecoboot.bin version.json
     )
     add_custom_target(package-standalone
         COMMAND zip -rq ${CMAKE_BINARY_DIR}/${PACKAGE_STANDALONE_FILE_NAME} "."
         WORKING_DIRECTORY ${PACKAGE_STAGING_DIRECTORY}/Standalone
-        DEPENDS ${ECOBOOT_FILE} package-standalone-staged  PurePhone
+        DEPENDS ${BIN_FILE}-target ${ECOBOOT_FILE} package-standalone-staged  PurePhone
         )
     set(UPDATE_STAGING_DIRECTORY ${PACKAGE_STAGING_DIRECTORY}/Update)
     add_custom_target(package-update-checksums
@@ -454,7 +463,7 @@ if (${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
         COMMAND tar
         -cf ${CMAKE_BINARY_DIR}/${PACKAGE_UPDATE_FILE_NAME}
         -C ${PACKAGE_STAGING_DIRECTORY}/Update "."
-        DEPENDS ecoboot.bin version.json PurePhone package-update-staged package-update-checksums
+        DEPENDS  ecoboot.bin version.json PurePhone package-update-staged package-update-checksums 
         )
 elseif (${PROJECT_TARGET} STREQUAL "TARGET_Linux")
     set(PACKAGE_STANDALONE_FILE_NAME ${PACKAGE_COMMON_NAME}-Standalone.tar.gz)
diff --git a/cmake/modules/GenUpdateVersionJson.cmake b/cmake/modules/GenUpdateVersionJson.cmake
index e6f3c5fa91f53f84dbb3c5455f8a6d59e4a08d78..50cff7807059f060da0b20179186a205a393bcf2 100644
--- a/cmake/modules/GenUpdateVersionJson.cmake
+++ b/cmake/modules/GenUpdateVersionJson.cmake
@@ -2,7 +2,7 @@
 # and bootloader version information for update packages . It is meant to be run
 # at build time by running CMake as a target.
 
-list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/config")
+list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/cmake/modules")
 include(Version)
 
 set(BOOTLOADER_INCLUDED "true")