flipperzero-firmware: 0.78.2 -> 0.81.2
This commit is contained in:
parent
51a8940440
commit
96178bf90b
5 changed files with 37 additions and 29 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From a45303be72a307e04379e989f8d9418c0bc2be0b Mon Sep 17 00:00:00 2001
|
||||
From 5a1296bed9f1e1a7c1a182828384309da31293a6 Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Sat, 22 Oct 2022 19:33:07 +0100
|
||||
Subject: [PATCH 1/4] simply do not run git
|
||||
|
|
@ -8,10 +8,10 @@ Subject: [PATCH 1/4] simply do not run git
|
|||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/scripts/version.py b/scripts/version.py
|
||||
index f4dd127f5..b0a27f705 100644
|
||||
index df891e646..03c0fbc62 100644
|
||||
--- a/scripts/version.py
|
||||
+++ b/scripts/version.py
|
||||
@@ -61,13 +61,7 @@ class GitVersion:
|
||||
@@ -74,13 +74,7 @@ class GitVersion:
|
||||
}
|
||||
|
||||
def _exec_git(self, args):
|
||||
|
|
@ -27,5 +27,5 @@ index f4dd127f5..b0a27f705 100644
|
|||
|
||||
class Main(App):
|
||||
--
|
||||
2.38.1
|
||||
2.39.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
From 0053661d07e31fa0caa85d83a030c6e1f2f52625 Mon Sep 17 00:00:00 2001
|
||||
From e4682380261b7207dee8992dc6533821f71d7fa8 Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Sat, 22 Oct 2022 19:35:00 +0100
|
||||
Subject: [PATCH 2/4] 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 | 29 ++++++++++-------------------
|
||||
1 file changed, 10 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/scripts/fbt_tools/fbt_assets.py b/scripts/fbt_tools/fbt_assets.py
|
||||
index e17487358..6350ffcb7 100644
|
||||
index e4c567993..145d6ddda 100644
|
||||
--- a/scripts/fbt_tools/fbt_assets.py
|
||||
+++ b/scripts/fbt_tools/fbt_assets.py
|
||||
@@ -75,26 +75,18 @@ def _invoke_git(args, source_dir):
|
||||
@@ -73,26 +73,17 @@ def _invoke_git(args, source_dir):
|
||||
|
||||
|
||||
def proto_ver_generator(target, source, env):
|
||||
|
|
@ -41,13 +41,13 @@ index e17487358..6350ffcb7 100644
|
|||
- source_dir=src_dir,
|
||||
- )
|
||||
- except (subprocess.CalledProcessError, EnvironmentError) as e:
|
||||
- raise SConsEnvironmentError("Git: describe failed")
|
||||
|
||||
- raise StopError("Git: describe failed")
|
||||
-
|
||||
- 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.38.1
|
||||
2.39.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 744d6356f5e8f91c944bb645677b4514f2f17e3d Mon Sep 17 00:00:00 2001
|
||||
From 0589a001f0207715e30e2bd9cb9f2edb39d53046 Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Sat, 22 Oct 2022 19:40:33 +0100
|
||||
Subject: [PATCH 3/4] scripts/fbt/version: no git
|
||||
|
|
@ -46,5 +46,5 @@ index e7fe2edaf..c07bc2915 100644
|
|||
except Exception as e:
|
||||
print("Failed to check for git changes", e)
|
||||
--
|
||||
2.38.1
|
||||
2.39.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,33 @@
|
|||
From d7ca7d6617950f13371aeabf179060a82cfccc88 Mon Sep 17 00:00:00 2001
|
||||
From a6e68ed93bd47302d8e0ab914ad463a1d7b07703 Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Sat, 22 Oct 2022 19:50:27 +0100
|
||||
Subject: [PATCH 4/4] scripts/sconsdist: disable strict_timestamps - allow FS
|
||||
timestamps pre 1980
|
||||
|
||||
---
|
||||
scripts/sconsdist.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
scripts/sconsdist.py | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py
|
||||
index 0fa120d87..3e950e681 100644
|
||||
index 23e194a94..5dd5db1ee 100644
|
||||
--- a/scripts/sconsdist.py
|
||||
+++ b/scripts/sconsdist.py
|
||||
@@ -82,6 +82,7 @@ class Main(App):
|
||||
self.get_dist_file_path(self.get_dist_file_name(foldertype, "zip")),
|
||||
@@ -92,6 +92,7 @@ class Main(App):
|
||||
self.get_dist_path(self.get_dist_file_name(foldertype, "zip")),
|
||||
"w",
|
||||
zipfile.ZIP_DEFLATED,
|
||||
+ strict_timestamps=False,
|
||||
) as _:
|
||||
pass
|
||||
|
||||
@@ -178,6 +179,7 @@ class Main(App):
|
||||
self.get_dist_path(self.get_dist_file_name("sdk", "zip")),
|
||||
"w",
|
||||
zipfile.ZIP_DEFLATED,
|
||||
+ strict_timestamps=False,
|
||||
) as zf:
|
||||
for root, _, files in walk(sdk_folder):
|
||||
for file in files:
|
||||
for component_key in sdk_components_keys:
|
||||
component_path = self._dist_components.get(component_key)
|
||||
--
|
||||
2.38.1
|
||||
2.39.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"src": {
|
||||
"url": "https://github.com/RogueMaster/flipperzero-firmware-wPlugins",
|
||||
"rev": "9477f38fce12c0cb2f06a679bd7b7ee82dc85d0f",
|
||||
"date": "2023-03-10T04:09:46-05:00",
|
||||
"path": "/nix/store/wfbyzijwv07mi5cxmz78jn0yhf7pn9ic-flipperzero-firmware-wPlugins-9477f38",
|
||||
"sha256": "11ixhk1ncb6qyzlw2z7gkpn3gkkc7f9lajq9k1h26d3zn6yz2h5s",
|
||||
"rev": "3c3bce64bc77b94e471c407bab57fd3d3738b879",
|
||||
"date": "2023-04-16T04:26:07-04:00",
|
||||
"path": "/nix/store/awsyqd31dnk4k8qrv0avw8pw4jrf26kz-flipperzero-firmware-wPlugins-3c3bce6",
|
||||
"sha256": "1s3hjlsmgpp6ivl8hbniwbff8w8hq5354wd3hnwmpnbl54dzwf3w",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
},
|
||||
"version": "RM0310-0416-0.78.2-9477f38",
|
||||
"upstreamVersion": "0.78.2"
|
||||
"version": "RM0416-0432-0.81.2-3c3bce6",
|
||||
"upstreamVersion": "0.81.2"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue