From e33468f54fa3b04ad45516e3498dcb115e004bc1 Mon Sep 17 00:00:00 2001 From: Lefucjusz Date: Thu, 24 Nov 2022 14:28:19 +0100 Subject: [PATCH] [MOS-783] Change boot.bin to os.bin Change the confusing system binary name. --- cmake/modules/AddBootBin.cmake | 4 ++-- cmake/modules/AddVersionJson.cmake | 2 +- image/user/boot.json | 2 +- module-utils/bootconfig/src/bootconfig.cpp | 2 +- module-vfs/paths/include/purefs/filesystem_paths.hpp | 2 +- products/PurePhone/BinaryAssetsVersions.cmake | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/modules/AddBootBin.cmake b/cmake/modules/AddBootBin.cmake index c85899da840ae14ee23a45ce4fa18fed3c9f695f..09775070091c3ab5aa3903de1e83ec07c1af19c1 100644 --- a/cmake/modules/AddBootBin.cmake +++ b/cmake/modules/AddBootBin.cmake @@ -1,5 +1,5 @@ function(add_boot_bin SOURCE_TARGET) - set(BIN_FILE ${SYSROOT_PATH}/system_a/bin/boot.bin) + set(BIN_FILE ${SYSROOT_PATH}/system_a/bin/os.bin) set_target_properties( ${SOURCE_TARGET} @@ -10,7 +10,7 @@ function(add_boot_bin SOURCE_TARGET) if (ENABLE_SECURE_BOOT) IF(EXISTS ${SIGN_CLIENT_PATH}/signclient.py) add_custom_command( - COMMENT "Generate signed boot.bin (Secure Boot)" + COMMENT "Generate signed os.bin (Secure Boot)" OUTPUT ${BIN_FILE} DEPENDS ${SOURCE_TARGET} COMMAND python3 ${SIGN_CLIENT_PATH}/signclient.py --in_file $ --out_file=${BIN_FILE} --keystore ${KEYSTORE} --keyslot ${KEYSLOT} --server ${SERVER} --login ${LOGIN} diff --git a/cmake/modules/AddVersionJson.cmake b/cmake/modules/AddVersionJson.cmake index ebcc7056fa11a52e6482ad72682ebdaf50ea624e..b9f896386872da9553f774c466c7a1ff1210fd40 100644 --- a/cmake/modules/AddVersionJson.cmake +++ b/cmake/modules/AddVersionJson.cmake @@ -6,7 +6,7 @@ function(add_version_rt1051_json SOURCE_TARGET) -DDST_FILE=${CMAKE_BINARY_DIR}/${SOURCE_TARGET}-version.json -DBOOTLOADER_FILENAME=ecoboot.bin -DBOOTLOADER_FILE=${SYSROOT_BIN_PATH}/ecoboot.bin - -DBOOT_FILENAME=boot.bin + -DBOOT_FILENAME=os.bin -DBOOT_FILE=$ -DBOOT_VERSION=${PROJECT_VERSION} -DRECOVERY_FILENAME=recovery.bin diff --git a/image/user/boot.json b/image/user/boot.json index f010155a7d9fb544c71f30a2b517a379922b63eb..09c949bcb807dcf000631e6b0c3ca1af21802cbc 100644 --- a/image/user/boot.json +++ b/image/user/boot.json @@ -16,7 +16,7 @@ "active": "a", "boot_attempts_max": "10" }, - "os": "boot.bin", + "os": "os.bin", "recovery": "recovery.bin", "bin_dir": "bin", "update_dir": "/user/update" diff --git a/module-utils/bootconfig/src/bootconfig.cpp b/module-utils/bootconfig/src/bootconfig.cpp index f3a3e0f234674b6c515921fad7e4586e75ee7f75..31b9979e321332385581354cc5c526910650397e 100644 --- a/module-utils/bootconfig/src/bootconfig.cpp +++ b/module-utils/bootconfig/src/bootconfig.cpp @@ -105,7 +105,7 @@ namespace boot return true; } else { - m_os_image = purefs::file::boot_bin; + m_os_image = purefs::file::os_bin; m_os_root_path = purefs::dir::getSystemDiskPath(); m_boot_json = bootJsonPath; m_timestamp = utils::time::getCurrentTimestamp().str("%c"); diff --git a/module-vfs/paths/include/purefs/filesystem_paths.hpp b/module-vfs/paths/include/purefs/filesystem_paths.hpp index 83feebbfa780b4eb93b17a0233c8690033c5a2dd..bd6efbd3a8e47d0ed902286cb073e62472bb24d6 100644 --- a/module-vfs/paths/include/purefs/filesystem_paths.hpp +++ b/module-vfs/paths/include/purefs/filesystem_paths.hpp @@ -31,7 +31,7 @@ namespace purefs namespace file { constexpr inline auto boot_json = "boot.json"; - constexpr inline auto boot_bin = "boot.bin"; + constexpr inline auto os_bin = "os.bin"; constexpr inline auto version_json = "version.json"; } // namespace file diff --git a/products/PurePhone/BinaryAssetsVersions.cmake b/products/PurePhone/BinaryAssetsVersions.cmake index 85c32377d513bc9c8b3bf51f4088adf6a7d84bf2..be6ecb717a5cf5b4f37ba615b427edf01e84fed4 100644 --- a/products/PurePhone/BinaryAssetsVersions.cmake +++ b/products/PurePhone/BinaryAssetsVersions.cmake @@ -1,7 +1,7 @@ # This file sets versions of downloaded binaries for release packaging purposes if( NOT DEFINED ECOBOOT_BIN_VERSION) - set(ECOBOOT_BIN_VERSION 1.1.2 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)