From 5ac4d1e18c649913a8f3c5ca4e5106e31289fc8a Mon Sep 17 00:00:00 2001
From: Lefucjusz <marcin.lyda@mudita.com>
Date: Wed, 14 Dec 2022 10:42:51 +0100
Subject: [PATCH] [MOS-000] Bump binaries and add Bell target

Change binary assets versions for both
products, fixed missing dependencies
in Bell's CMake, added 'Bell' target
that automatically builds the
image.
---
 cmake/modules/AddPackage.cmake                 | 8 ++++++--
 products/BellHybrid/BinaryAssetsVersions.cmake | 2 +-
 products/BellHybrid/CMakeLists.txt             | 6 ++++++
 products/PurePhone/BinaryAssetsVersions.cmake  | 4 ++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/cmake/modules/AddPackage.cmake b/cmake/modules/AddPackage.cmake
index 5633eeae451b6f4c48445b8ed4c6a667e32585e6..5be092c02484e11ad8560b32f253cfee922834a0 100644
--- a/cmake/modules/AddPackage.cmake
+++ b/cmake/modules/AddPackage.cmake
@@ -91,11 +91,15 @@ function(add_update_package SOURCE_TARGET)
     message("Adding '${SOURCE_TARGET}-UpdatePackage' target")
     if(ENABLE_SECURE_BOOT)
         add_custom_target(${SOURCE_TARGET}-UpdatePackage
-            DEPENDS ${UPDATE_PKG}.sig
+            DEPENDS
+                ${SOURCE_TARGET}-disk-img
+                ${UPDATE_PKG}.sig
         )
     else()
         add_custom_target(${SOURCE_TARGET}-UpdatePackage
-            DEPENDS ${UPDATE_PKG}
+            DEPENDS
+                ${SOURCE_TARGET}-disk-img
+                ${UPDATE_PKG}
         )
     endif()
 endfunction()
diff --git a/products/BellHybrid/BinaryAssetsVersions.cmake b/products/BellHybrid/BinaryAssetsVersions.cmake
index be6ecb717a5cf5b4f37ba615b427edf01e84fed4..b2aa9d78c1d9929955b78cd70cd2311b914d6e81 100644
--- a/products/BellHybrid/BinaryAssetsVersions.cmake
+++ b/products/BellHybrid/BinaryAssetsVersions.cmake
@@ -5,5 +5,5 @@ if( NOT DEFINED ECOBOOT_BIN_VERSION)
 endif()
 
 if (NOT DEFINED RECOVERY_BIN_VERSION)
-    set(RECOVERY_BIN_VERSION 0.0.1 CACHE STRING "recovery binary version to download from recovery release page")
+    set(RECOVERY_BIN_VERSION 1.0.0 CACHE STRING "recovery binary version to download from recovery release page")
 endif()
diff --git a/products/BellHybrid/CMakeLists.txt b/products/BellHybrid/CMakeLists.txt
index 3b22f5b6cf9a0fc91bfa1ed626813d7c73887b7e..69c3fd4a35c27fa5400cf71f44c659f4ac9f9af4 100644
--- a/products/BellHybrid/CMakeLists.txt
+++ b/products/BellHybrid/CMakeLists.txt
@@ -1,5 +1,11 @@
 add_executable(BellHybrid)
 
+add_custom_target(Bell ALL
+    DEPENDS
+        BellHybrid
+        BellHybrid.img
+        )
+
 target_link_directories(BellHybrid PRIVATE ${PROJECT_LIB_DIRECTORY})
 
 target_compile_definitions(BellHybrid
diff --git a/products/PurePhone/BinaryAssetsVersions.cmake b/products/PurePhone/BinaryAssetsVersions.cmake
index c099d702bb25e96d2831f7c616f230797ecc6f1a..b2aa9d78c1d9929955b78cd70cd2311b914d6e81 100644
--- a/products/PurePhone/BinaryAssetsVersions.cmake
+++ b/products/PurePhone/BinaryAssetsVersions.cmake
@@ -1,9 +1,9 @@
 # This file sets versions of downloaded binaries for release packaging purposes
 
 if( NOT DEFINED ECOBOOT_BIN_VERSION)
-    set(ECOBOOT_BIN_VERSION 2.0.3 CACHE STRING "bootloader binary version to download from bootloader release page")
+    set(ECOBOOT_BIN_VERSION 2.0.0 CACHE STRING "bootloader binary version to download from bootloader release page")
 endif()
 
 if (NOT DEFINED RECOVERY_BIN_VERSION)
-    set(RECOVERY_BIN_VERSION 1.0.2 CACHE STRING "recovery binary version to download from recovery release page")
+    set(RECOVERY_BIN_VERSION 1.0.0 CACHE STRING "recovery binary version to download from recovery release page")
 endif()