From 637ee263d356d6b0b6dfb079f6c113320f01b5d4 Mon Sep 17 00:00:00 2001 From: Andrey Tolstoy Date: Sat, 11 Sep 2021 01:53:15 +0700 Subject: [PATCH] bump module version for 2.0.2-rc.1 (2020) --- CHANGELOG.md | 6 ++++++ build/release.sh | 2 +- build/version.mk | 4 ++-- modules/shared/system_module_version.mk | 2 +- system/inc/system_version.h | 4 +++- system/system-versions.md | 1 + 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f81417e7d..539b694b2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2.0.2-rc.1 + +### FEATURES + +- [Electron] Optional feature to use HSE/LSI as RTC clock source instead of LSE (external 32KHz XTAL) [#2354](https://github.com/particle-iot/device-os/pull/2354) + ## 2.0.1 ### ENHANCEMENTS diff --git a/build/release.sh b/build/release.sh index 6e8d54183d..24fd78f3ce 100755 --- a/build/release.sh +++ b/build/release.sh @@ -1,7 +1,7 @@ #!/bin/bash set -o errexit -o pipefail -o noclobber -o nounset -VERSION="2.0.1" +VERSION="2.0.2-rc.1" function display_help () { diff --git a/build/version.mk b/build/version.mk index e3e916bc02..3d26782cc7 100755 --- a/build/version.mk +++ b/build/version.mk @@ -1,7 +1,7 @@ -VERSION_STRING = 2.0.1 +VERSION_STRING = 2.0.2-rc.1 # PRODUCT_FIRMWARE_VERSION reported by default # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release -VERSION = 2011 +VERSION = 2020 CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING) diff --git a/modules/shared/system_module_version.mk b/modules/shared/system_module_version.mk index 050af1edc6..e59e30e3fd 100644 --- a/modules/shared/system_module_version.mk +++ b/modules/shared/system_module_version.mk @@ -1,6 +1,6 @@ # Skip to next 100 every v0.x.0 release (e.g. 108 for v0.6.2 to 200 for v0.7.0-rc.1) # Bump by 1 for every prerelease or release with the same v0.x.* base. -COMMON_MODULE_VERSION ?= 2011 +COMMON_MODULE_VERSION ?= 2020 SYSTEM_PART1_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) SYSTEM_PART2_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) SYSTEM_PART3_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) diff --git a/system/inc/system_version.h b/system/inc/system_version.h index 2a6429ceb8..d61b5f85b1 100644 --- a/system/inc/system_version.h +++ b/system/inc/system_version.h @@ -167,7 +167,8 @@ extern "C" { #define SYSTEM_VERSION_v201ALPHA1 SYSTEM_VERSION_ALPHA(2, 0, 1, 1) #define SYSTEM_VERSION_v201ALPHA2 SYSTEM_VERSION_ALPHA(2, 0, 1, 2) #define SYSTEM_VERSION_v201 SYSTEM_VERSION_DEFAULT(2, 0, 1) -#define SYSTEM_VERSION SYSTEM_VERSION_v201 +#define SYSTEM_VERSION_v202RC1 SYSTEM_VERSION_RC(2, 0, 2, 1) +#define SYSTEM_VERSION SYSTEM_VERSION_v202RC1 /** * Previously we would set the least significant byte to 0 for the final release, but to make @@ -299,6 +300,7 @@ extern "C" { #define SYSTEM_VERSION_201ALPHA1 #define SYSTEM_VERSION_201ALPHA2 #define SYSTEM_VERSION_201 +#define SYSTEM_VERSION_202RC1 typedef struct __attribute__((packed)) SystemVersionInfo { diff --git a/system/system-versions.md b/system/system-versions.md index 9963f0cdee..488240b2e5 100644 --- a/system/system-versions.md +++ b/system/system-versions.md @@ -133,6 +133,7 @@ | 1004 | 2009 | 2.0.1-alpha.1 | Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker | | 1005 | 2010 | 2.0.1-alpha.2 | Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker | | 1005 | 2011 | 2.0.1 | Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker | +| 1005 | 2020 | 2.0.2-rc.1 | Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker | [1] For 0.8.0-rc.1, The v101 bootloader was also released in the Github releases as v200. Thus the next released bootloader in the 0.8.x line should be v201. As of 4/5/2018: 22 device had v200 bootloaders.