flipperzero-firmware: RM0101-0245-0.93.9-116e51f -> RM0229-1520-0.98.4-b46fce0
This commit is contained in:
parent
6d7ea49ce0
commit
1abcc07da1
7 changed files with 69 additions and 55 deletions
|
|
@ -1,6 +1,6 @@
|
|||
From a25b3c50f46a4939504bbaa1f1e0a3ab9b1ee11e Mon Sep 17 00:00:00 2001
|
||||
From ec4e9cd4058520134e3c0a86643b7662bb7ab452 Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Sat, 22 Oct 2022 19:33:07 +0100
|
||||
Date: Sat, 2 Mar 2024 00:05:01 +0000
|
||||
Subject: [PATCH 1/5] simply do not run git
|
||||
|
||||
---
|
||||
|
|
@ -8,7 +8,7 @@ Subject: [PATCH 1/5] simply do not run git
|
|||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/scripts/version.py b/scripts/version.py
|
||||
index 5a62c3a42..9c7240f8f 100755
|
||||
index 15e029cd7..b10a8ca1a 100644
|
||||
--- a/scripts/version.py
|
||||
+++ b/scripts/version.py
|
||||
@@ -73,13 +73,7 @@ class GitVersion:
|
||||
|
|
@ -27,5 +27,5 @@ index 5a62c3a42..9c7240f8f 100755
|
|||
|
||||
class Main(App):
|
||||
--
|
||||
2.41.0
|
||||
2.43.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
From 07b4dcdd06e59f02c3c56df94f0903c36360c183 Mon Sep 17 00:00:00 2001
|
||||
From 3ee494686859ff54de39d9b9732ea8661182a8aa Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Sat, 22 Oct 2022 19:35:00 +0100
|
||||
Date: Sat, 2 Mar 2024 00:05:17 +0000
|
||||
Subject: [PATCH 2/5] proto_ver_generator: use changelog, not git
|
||||
|
||||
---
|
||||
scripts/fbt_tools/fbt_assets.py | 28 ++++++++++------------------
|
||||
1 file changed, 10 insertions(+), 18 deletions(-)
|
||||
scripts/fbt_tools/fbt_assets.py | 42 ++++++++-------------------------
|
||||
1 file changed, 10 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/scripts/fbt_tools/fbt_assets.py b/scripts/fbt_tools/fbt_assets.py
|
||||
index 4f4d3bffd..f798a15b0 100644
|
||||
index 492a66b66..e6e31beae 100644
|
||||
--- a/scripts/fbt_tools/fbt_assets.py
|
||||
+++ b/scripts/fbt_tools/fbt_assets.py
|
||||
@@ -76,26 +76,18 @@ def _invoke_git(args, source_dir):
|
||||
@@ -78,39 +78,17 @@ def __invoke_git(args, source_dir):
|
||||
|
||||
|
||||
def proto_ver_generator(target, source, env):
|
||||
def _proto_ver_generator(target, source, env):
|
||||
+ changelog_content = source[0].get_text_contents()
|
||||
+ for ln in changelog_content.split('\n'):
|
||||
+ ln = ln.strip()
|
||||
|
|
@ -26,28 +26,41 @@ index 4f4d3bffd..f798a15b0 100644
|
|||
+ Exit()
|
||||
target_file = target[0]
|
||||
- src_dir = source[0].dir.abspath
|
||||
- try:
|
||||
- _invoke_git(
|
||||
- ["fetch", "--tags"],
|
||||
- source_dir=src_dir,
|
||||
- )
|
||||
- except (subprocess.CalledProcessError, EnvironmentError):
|
||||
- # Not great, not terrible
|
||||
- print(fg.boldred("Git: fetch failed"))
|
||||
-
|
||||
- try:
|
||||
- git_describe = _invoke_git(
|
||||
- ["describe", "--tags", "--abbrev=0"],
|
||||
- source_dir=src_dir,
|
||||
- )
|
||||
- except (subprocess.CalledProcessError, EnvironmentError):
|
||||
- raise StopError("Git: describe failed")
|
||||
|
||||
- def fetch(unshallow=False):
|
||||
- git_args = ["fetch", "--tags"]
|
||||
- if unshallow:
|
||||
- git_args.append("--unshallow")
|
||||
-
|
||||
- try:
|
||||
- __invoke_git(git_args, source_dir=src_dir)
|
||||
- except (subprocess.CalledProcessError, EnvironmentError):
|
||||
- # Not great, not terrible
|
||||
- print(fg.boldred("Git: fetch failed"))
|
||||
-
|
||||
- def describe():
|
||||
- try:
|
||||
- return __invoke_git(
|
||||
- ["describe", "--tags", "--abbrev=0"],
|
||||
- source_dir=src_dir,
|
||||
- )
|
||||
- except (subprocess.CalledProcessError, EnvironmentError):
|
||||
- return None
|
||||
-
|
||||
- fetch()
|
||||
- git_describe = describe()
|
||||
- if not git_describe:
|
||||
- fetch(unshallow=True)
|
||||
- git_describe = describe()
|
||||
-
|
||||
- if not git_describe:
|
||||
- raise StopError("Failed to process git tags for protobuf versioning")
|
||||
-
|
||||
- git_major, git_minor = git_describe.split(".")
|
||||
+ git_major, git_minor = version.split(".")
|
||||
version_file_data = (
|
||||
"#pragma once",
|
||||
f"#define PROTOBUF_MAJOR_VERSION {git_major}",
|
||||
--
|
||||
2.41.0
|
||||
2.43.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 41ff1018429410c279ef3f956dc2748d097dc4ff Mon Sep 17 00:00:00 2001
|
||||
From 36a893def13dfdf41da9da4ef259402173e5141e Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Sat, 22 Oct 2022 19:40:33 +0100
|
||||
Date: Sat, 2 Mar 2024 00:05:39 +0000
|
||||
Subject: [PATCH 3/5] scripts/fbt/version: no git
|
||||
|
||||
---
|
||||
|
|
@ -46,5 +46,5 @@ index 09f48c8eb..e76bd1bc8 100644
|
|||
except Exception as e:
|
||||
print("Failed to check for git changes", e)
|
||||
--
|
||||
2.41.0
|
||||
2.43.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 89c700c42bffea14cdcaed8c2918a4d97c4e6c59 Mon Sep 17 00:00:00 2001
|
||||
From e928afaa2588bb6afe740b20cf1fb3ea6a1c9f73 Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Sat, 22 Oct 2022 19:50:27 +0100
|
||||
Date: Sat, 2 Mar 2024 00:06:08 +0000
|
||||
Subject: [PATCH 4/5] scripts/sconsdist: disable strict_timestamps - allow FS
|
||||
timestamps pre 1980
|
||||
|
||||
|
|
@ -9,11 +9,11 @@ Subject: [PATCH 4/5] scripts/sconsdist: disable strict_timestamps - allow FS
|
|||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py
|
||||
index 45d6ae7f0..4b64f9f94 100755
|
||||
index 71c388ba2..96853e683 100755
|
||||
--- a/scripts/sconsdist.py
|
||||
+++ b/scripts/sconsdist.py
|
||||
@@ -166,6 +166,7 @@ class Main(App):
|
||||
self.get_dist_path(self.get_dist_file_name("sdk", "zip")),
|
||||
@@ -173,6 +173,7 @@ class Main(App):
|
||||
sdk_bundle_path,
|
||||
"w",
|
||||
zipfile.ZIP_DEFLATED,
|
||||
+ strict_timestamps=False,
|
||||
|
|
@ -21,5 +21,5 @@ index 45d6ae7f0..4b64f9f94 100755
|
|||
for component_key in sdk_components_keys:
|
||||
component_path = self._dist_components.get(component_key)
|
||||
--
|
||||
2.41.0
|
||||
2.43.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
From 90e3fa4510049a6448fabece5084a2cc0ac10177 Mon Sep 17 00:00:00 2001
|
||||
From e20a3b27ed00317ef2b3eb13f61bef7207ea7d69 Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Wed, 19 Jul 2023 02:49:56 +0000
|
||||
Date: Sat, 2 Mar 2024 00:07:15 +0000
|
||||
Subject: [PATCH 5/5] pass SOURCE_DATE_EPOCH to tooling
|
||||
|
||||
---
|
||||
site_scons/environ.scons | 1 +
|
||||
scripts/fbt/util.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/site_scons/environ.scons b/site_scons/environ.scons
|
||||
index b638b1018..71baba7ae 100644
|
||||
--- a/site_scons/environ.scons
|
||||
+++ b/site_scons/environ.scons
|
||||
@@ -20,6 +20,7 @@ variables_to_forward = [
|
||||
# CI/CD variables
|
||||
diff --git a/scripts/fbt/util.py b/scripts/fbt/util.py
|
||||
index 6b1f9dc6c..e149bc14d 100644
|
||||
--- a/scripts/fbt/util.py
|
||||
+++ b/scripts/fbt/util.py
|
||||
@@ -17,6 +17,7 @@ FORWARDED_ENV_VARIABLES = [
|
||||
"WORKFLOW_BRANCH_OR_TAG",
|
||||
"DIST_SUFFIX",
|
||||
"FORCE_NO_DIRTY",
|
||||
+ "SOURCE_DATE_EPOCH",
|
||||
# Python & other tools
|
||||
"HOME",
|
||||
"APPDATA",
|
||||
--
|
||||
2.41.0
|
||||
2.43.0
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ let
|
|||
pyelftools
|
||||
]);
|
||||
deps = with pkgs; [
|
||||
gcc-arm-embedded-10
|
||||
gcc-arm-embedded-12
|
||||
openocd
|
||||
clang
|
||||
dfu-util
|
||||
|
|
@ -81,6 +81,7 @@ pkgs.stdenvNoCC.mkDerivation rec {
|
|||
|
||||
mkdir -p $NIX_BUILD_TOP/bin
|
||||
ln -s $(command -v arm-none-eabi-gcc) $NIX_BUILD_TOP/bin/arm-none-eabi-cc
|
||||
ln -s $(command -v arm-none-eabi-gdb) $NIX_BUILD_TOP/bin/arm-none-eabi-gdb-py3
|
||||
export PATH=$NIX_BUILD_TOP/bin:$PATH
|
||||
export WORKFLOW_BRANCH_OR_TAG DIST_SUFFIX CUSTOM_FLIPPER_NAME
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{
|
||||
"src": {
|
||||
"url": "https://github.com/RogueMaster/flipperzero-firmware-wPlugins",
|
||||
"rev": "116e51fcb2e3b6d53a628e0e30b97493cad3181c",
|
||||
"date": "2024-01-01T02:34:55-05:00",
|
||||
"path": "/nix/store/852m5fkmin6a0888qi36l09mx8dv26l1-flipperzero-firmware-wPlugins-116e51f",
|
||||
"sha256": "174jjpj5hyxaa5jmr1w2vn2gbvs58hnr7sa72hyr23jyznpvdd0a",
|
||||
"hash": "sha256-CrS2r/1eDpE9FEfpky1ERe/1hN2Ch1xlUap7WOSVkpw=",
|
||||
"rev": "b46fce00f58965676e1b9e074a2301600777c975",
|
||||
"date": "2024-02-29T15:18:51-05:00",
|
||||
"path": "/nix/store/5gyzakrd8vw1gxcim2qa8gl2zyyrb1nm-flipperzero-firmware-wPlugins-b46fce0",
|
||||
"sha256": "0q340jyq7fzq9nwn05rplgfgjxy3jz6kwba7z1zln5m3y2cval98",
|
||||
"hash": "sha256-KFG1mfCjFkt/+EctPs2Xw3f53KM3F2C5Tfi7g70EZGA=",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
},
|
||||
"version": "RM0101-0245-0.93.9-116e51f",
|
||||
"upstreamVersion": "0.93.9"
|
||||
"version": "RM0229-1520-0.98.4-b46fce0",
|
||||
"upstreamVersion": "0.98.4"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue