From 061f541e0a5f0c2f87a0a61b1eb04c7addb732c6 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 16 Sep 2023 16:00:24 +0100 Subject: [PATCH] flipperzero-firmware: 0.88.1 -> 0.90.2 --- .../0001-simply-do-not-run-git.patch | 8 ++++---- ...proto_ver_generator-use-changelog-not-git.patch | 8 ++++---- .../0003-scripts-fbt-version-no-git.patch | 4 ++-- ...nsdist-disable-strict_timestamps-allow-FS.patch | 6 +++--- .../0005-pass-SOURCE_DATE_EPOCH-to-tooling.patch | 10 +++++----- nix/pkgs/flipperzero-firmware/version.json | 14 +++++++------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/nix/pkgs/flipperzero-firmware/0001-simply-do-not-run-git.patch b/nix/pkgs/flipperzero-firmware/0001-simply-do-not-run-git.patch index 887970becc..46a06cce3a 100644 --- a/nix/pkgs/flipperzero-firmware/0001-simply-do-not-run-git.patch +++ b/nix/pkgs/flipperzero-firmware/0001-simply-do-not-run-git.patch @@ -1,4 +1,4 @@ -From ccc97d3f4e2c4229b1f08fde962f14eb2c8ea11a Mon Sep 17 00:00:00 2001 +From a25b3c50f46a4939504bbaa1f1e0a3ab9b1ee11e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 22 Oct 2022 19:33:07 +0100 Subject: [PATCH 1/5] simply do not run git @@ -8,10 +8,10 @@ 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 db437da95..e5bf81083 100755 +index 5a62c3a42..9c7240f8f 100755 --- a/scripts/version.py +++ b/scripts/version.py -@@ -83,13 +83,7 @@ class GitVersion: +@@ -73,13 +73,7 @@ class GitVersion: return origins def _exec_git(self, args): @@ -27,5 +27,5 @@ index db437da95..e5bf81083 100755 class Main(App): -- -2.40.1 +2.41.0 diff --git a/nix/pkgs/flipperzero-firmware/0002-proto_ver_generator-use-changelog-not-git.patch b/nix/pkgs/flipperzero-firmware/0002-proto_ver_generator-use-changelog-not-git.patch index f63d2b40f0..84169cfd79 100644 --- a/nix/pkgs/flipperzero-firmware/0002-proto_ver_generator-use-changelog-not-git.patch +++ b/nix/pkgs/flipperzero-firmware/0002-proto_ver_generator-use-changelog-not-git.patch @@ -1,4 +1,4 @@ -From 02bd53dd56448d44770723dcc3885dbef37d2da8 Mon Sep 17 00:00:00 2001 +From 07b4dcdd06e59f02c3c56df94f0903c36360c183 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 22 Oct 2022 19:35:00 +0100 Subject: [PATCH 2/5] proto_ver_generator: use changelog, not git @@ -8,10 +8,10 @@ Subject: [PATCH 2/5] proto_ver_generator: use changelog, not git 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/scripts/fbt_tools/fbt_assets.py b/scripts/fbt_tools/fbt_assets.py -index 68617c254..e7afb2d5c 100644 +index 4f4d3bffd..f798a15b0 100644 --- a/scripts/fbt_tools/fbt_assets.py +++ b/scripts/fbt_tools/fbt_assets.py -@@ -73,26 +73,18 @@ def _invoke_git(args, source_dir): +@@ -76,26 +76,18 @@ def _invoke_git(args, source_dir): def proto_ver_generator(target, source, env): @@ -49,5 +49,5 @@ index 68617c254..e7afb2d5c 100644 "#pragma once", f"#define PROTOBUF_MAJOR_VERSION {git_major}", -- -2.40.1 +2.41.0 diff --git a/nix/pkgs/flipperzero-firmware/0003-scripts-fbt-version-no-git.patch b/nix/pkgs/flipperzero-firmware/0003-scripts-fbt-version-no-git.patch index e5cb714d23..37059f64f0 100644 --- a/nix/pkgs/flipperzero-firmware/0003-scripts-fbt-version-no-git.patch +++ b/nix/pkgs/flipperzero-firmware/0003-scripts-fbt-version-no-git.patch @@ -1,4 +1,4 @@ -From 41ec025bdee3238a23e5820443516b52f68eddf7 Mon Sep 17 00:00:00 2001 +From 41ff1018429410c279ef3f956dc2748d097dc4ff Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 22 Oct 2022 19:40:33 +0100 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.40.1 +2.41.0 diff --git a/nix/pkgs/flipperzero-firmware/0004-scripts-sconsdist-disable-strict_timestamps-allow-FS.patch b/nix/pkgs/flipperzero-firmware/0004-scripts-sconsdist-disable-strict_timestamps-allow-FS.patch index 263cc432a6..34329d799e 100644 --- a/nix/pkgs/flipperzero-firmware/0004-scripts-sconsdist-disable-strict_timestamps-allow-FS.patch +++ b/nix/pkgs/flipperzero-firmware/0004-scripts-sconsdist-disable-strict_timestamps-allow-FS.patch @@ -1,4 +1,4 @@ -From 56353d725ea688580ecb5c022a78ce912646bbe8 Mon Sep 17 00:00:00 2001 +From 89c700c42bffea14cdcaed8c2918a4d97c4e6c59 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 22 Oct 2022 19:50:27 +0100 Subject: [PATCH 4/5] scripts/sconsdist: disable strict_timestamps - allow FS @@ -9,7 +9,7 @@ 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 acbe526df..409108b1f 100755 +index 45d6ae7f0..4b64f9f94 100755 --- a/scripts/sconsdist.py +++ b/scripts/sconsdist.py @@ -166,6 +166,7 @@ class Main(App): @@ -21,5 +21,5 @@ index acbe526df..409108b1f 100755 for component_key in sdk_components_keys: component_path = self._dist_components.get(component_key) -- -2.40.1 +2.41.0 diff --git a/nix/pkgs/flipperzero-firmware/0005-pass-SOURCE_DATE_EPOCH-to-tooling.patch b/nix/pkgs/flipperzero-firmware/0005-pass-SOURCE_DATE_EPOCH-to-tooling.patch index f9c34636c2..a6ffe102b3 100644 --- a/nix/pkgs/flipperzero-firmware/0005-pass-SOURCE_DATE_EPOCH-to-tooling.patch +++ b/nix/pkgs/flipperzero-firmware/0005-pass-SOURCE_DATE_EPOCH-to-tooling.patch @@ -1,4 +1,4 @@ -From a4aade509d5b686f75d74371da22079d4c6356a0 Mon Sep 17 00:00:00 2001 +From 90e3fa4510049a6448fabece5084a2cc0ac10177 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 19 Jul 2023 02:49:56 +0000 Subject: [PATCH 5/5] pass SOURCE_DATE_EPOCH to tooling @@ -8,17 +8,17 @@ Subject: [PATCH 5/5] pass SOURCE_DATE_EPOCH to tooling 1 file changed, 1 insertion(+) diff --git a/site_scons/environ.scons b/site_scons/environ.scons -index 0cdc45557..16f44326e 100644 +index b638b1018..71baba7ae 100644 --- a/site_scons/environ.scons +++ b/site_scons/environ.scons -@@ -21,6 +21,7 @@ variables_to_forward = [ +@@ -20,6 +20,7 @@ variables_to_forward = [ + # CI/CD variables "WORKFLOW_BRANCH_OR_TAG", "DIST_SUFFIX", - "FORCE_NO_DIRTY", + "SOURCE_DATE_EPOCH", # Python & other tools "HOME", "APPDATA", -- -2.40.1 +2.41.0 diff --git a/nix/pkgs/flipperzero-firmware/version.json b/nix/pkgs/flipperzero-firmware/version.json index c8eb4ec85e..73491198ef 100644 --- a/nix/pkgs/flipperzero-firmware/version.json +++ b/nix/pkgs/flipperzero-firmware/version.json @@ -1,16 +1,16 @@ { "src": { "url": "https://github.com/RogueMaster/flipperzero-firmware-wPlugins", - "rev": "edcadc0e424683054cd589dd39375b45d7cfff0c", - "date": "2023-08-07T14:09:55-04:00", - "path": "/nix/store/pxxqvjfrinbxg8q7hlk3il9rsg7mslc9-flipperzero-firmware-wPlugins-edcadc0", - "sha256": "080mqik5rw8jg27lm1ykfafp20vbhww4y2l9mh20xcn5rzylx2hq", - "hash": "sha256-GIpO/c/Fsg4ErIkKTziHawNxnXLTh0qPeBLxXGbEFSA=", + "rev": "215b031ba8be0413c9c7b85f2a8b5a4cc1983a9a", + "date": "2023-09-14T16:08:31-04:00", + "path": "/nix/store/ykf4l73qfz1mf5y1qngwgpcg6vds99m8-flipperzero-firmware-wPlugins-215b031", + "sha256": "1xqh27p9yldjzabmbqacggj0dyb13kj78ir83iq1j8s26qd8hr8v", + "hash": "sha256-G2WIGjZCIxlwHChHdOQcYfkG5HtM4VWX+rJRn+4REPc=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false }, - "version": "RM0807-1438-0.88.1-edcadc0", - "upstreamVersion": "0.88.1" + "version": "RM0914-1718-0.90.2-215b031", + "upstreamVersion": "0.90.2" }