From b3e38809c3ff40f8748928bbd70368422ef29451 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 19 Jul 2023 02:54:50 +0000 Subject: [PATCH] flipperzero-firmware: update --- .../0001-simply-do-not-run-git.patch | 12 +++++----- ..._ver_generator-use-changelog-not-git.patch | 6 ++--- .../0003-scripts-fbt-version-no-git.patch | 6 ++--- ...t-disable-strict_timestamps-allow-FS.patch | 22 ++++++----------- ...05-pass-SOURCE_DATE_EPOCH-to-tooling.patch | 24 +++++++++++++++++++ nix/pkgs/flipperzero-firmware/default.nix | 2 ++ nix/pkgs/flipperzero-firmware/version.json | 12 +++++----- 7 files changed, 51 insertions(+), 33 deletions(-) create mode 100644 nix/pkgs/flipperzero-firmware/0005-pass-SOURCE_DATE_EPOCH-to-tooling.patch 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 3f00ae1d3b..887970becc 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,18 +1,18 @@ -From a93c1256674196fed9575a57a2efb23a54f7d244 Mon Sep 17 00:00:00 2001 +From ccc97d3f4e2c4229b1f08fde962f14eb2c8ea11a Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 22 Oct 2022 19:33:07 +0100 -Subject: [PATCH 1/4] simply do not run git +Subject: [PATCH 1/5] simply do not run git --- scripts/version.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/version.py b/scripts/version.py -index 101224e21..1f9be40ed 100644 +index db437da95..e5bf81083 100755 --- a/scripts/version.py +++ b/scripts/version.py -@@ -74,13 +74,7 @@ class GitVersion: - } +@@ -83,13 +83,7 @@ class GitVersion: + return origins def _exec_git(self, args): - cmd = ["git"] @@ -27,5 +27,5 @@ index 101224e21..1f9be40ed 100644 class Main(App): -- -2.40.0 +2.40.1 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 88b7917981..f63d2b40f0 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,7 +1,7 @@ -From 0e9f71539ccf7a88c02a800f00b3c5d6e693444b Mon Sep 17 00:00:00 2001 +From 02bd53dd56448d44770723dcc3885dbef37d2da8 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 22 Oct 2022 19:35:00 +0100 -Subject: [PATCH 2/4] proto_ver_generator: use changelog, not git +Subject: [PATCH 2/5] proto_ver_generator: use changelog, not git --- scripts/fbt_tools/fbt_assets.py | 28 ++++++++++------------------ @@ -49,5 +49,5 @@ index 68617c254..e7afb2d5c 100644 "#pragma once", f"#define PROTOBUF_MAJOR_VERSION {git_major}", -- -2.40.0 +2.40.1 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 aa09e60738..e5cb714d23 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,7 +1,7 @@ -From f8fc39744b594becca3543e6375dfd3bb1821bab Mon Sep 17 00:00:00 2001 +From 41ec025bdee3238a23e5820443516b52f68eddf7 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 22 Oct 2022 19:40:33 +0100 -Subject: [PATCH 3/4] scripts/fbt/version: no git +Subject: [PATCH 3/5] scripts/fbt/version: no git --- scripts/fbt/version.py | 19 +++---------------- @@ -46,5 +46,5 @@ index 09f48c8eb..e76bd1bc8 100644 except Exception as e: print("Failed to check for git changes", e) -- -2.40.0 +2.40.1 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 1c9adc6243..263cc432a6 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,26 +1,18 @@ -From 534d8980354d87e2d1cb85def2cc50de8480cb83 Mon Sep 17 00:00:00 2001 +From 56353d725ea688580ecb5c022a78ce912646bbe8 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 22 Oct 2022 19:50:27 +0100 -Subject: [PATCH 4/4] scripts/sconsdist: disable strict_timestamps - allow FS +Subject: [PATCH 4/5] scripts/sconsdist: disable strict_timestamps - allow FS timestamps pre 1980 --- - scripts/sconsdist.py | 2 ++ - 1 file changed, 2 insertions(+) + scripts/sconsdist.py | 1 + + 1 file changed, 1 insertion(+) diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py -index 23e194a94..5dd5db1ee 100644 +index acbe526df..409108b1f 100755 --- a/scripts/sconsdist.py +++ b/scripts/sconsdist.py -@@ -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): +@@ -166,6 +166,7 @@ class Main(App): self.get_dist_path(self.get_dist_file_name("sdk", "zip")), "w", zipfile.ZIP_DEFLATED, @@ -29,5 +21,5 @@ index 23e194a94..5dd5db1ee 100644 for component_key in sdk_components_keys: component_path = self._dist_components.get(component_key) -- -2.40.0 +2.40.1 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 new file mode 100644 index 0000000000..f9c34636c2 --- /dev/null +++ b/nix/pkgs/flipperzero-firmware/0005-pass-SOURCE_DATE_EPOCH-to-tooling.patch @@ -0,0 +1,24 @@ +From a4aade509d5b686f75d74371da22079d4c6356a0 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 + +--- + site_scons/environ.scons | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/site_scons/environ.scons b/site_scons/environ.scons +index 0cdc45557..16f44326e 100644 +--- a/site_scons/environ.scons ++++ b/site_scons/environ.scons +@@ -21,6 +21,7 @@ variables_to_forward = [ + "WORKFLOW_BRANCH_OR_TAG", + "DIST_SUFFIX", + "FORCE_NO_DIRTY", ++ "SOURCE_DATE_EPOCH", + # Python & other tools + "HOME", + "APPDATA", +-- +2.40.1 + diff --git a/nix/pkgs/flipperzero-firmware/default.nix b/nix/pkgs/flipperzero-firmware/default.nix index bb09f25e51..74f1798b11 100644 --- a/nix/pkgs/flipperzero-firmware/default.nix +++ b/nix/pkgs/flipperzero-firmware/default.nix @@ -37,6 +37,7 @@ let (pm.toPythonModule scons) ansi colorlog + pyelftools ]); deps = with pkgs; [ gcc-arm-embedded-10 @@ -63,6 +64,7 @@ pkgs.stdenvNoCC.mkDerivation rec { ./0002-proto_ver_generator-use-changelog-not-git.patch ./0003-scripts-fbt-version-no-git.patch ./0004-scripts-sconsdist-disable-strict_timestamps-allow-FS.patch + ./0005-pass-SOURCE_DATE_EPOCH-to-tooling.patch ]; nativeBuildInputs = deps; diff --git a/nix/pkgs/flipperzero-firmware/version.json b/nix/pkgs/flipperzero-firmware/version.json index 09c4b91603..00538473de 100644 --- a/nix/pkgs/flipperzero-firmware/version.json +++ b/nix/pkgs/flipperzero-firmware/version.json @@ -1,15 +1,15 @@ { "src": { "url": "https://github.com/RogueMaster/flipperzero-firmware-wPlugins", - "rev": "c86c2a26bd9ffe0165f5879d6db12be2f3ee7a9f", - "date": "2023-05-25T00:21:53-04:00", - "path": "/nix/store/00idimj8k7a077qdphmh63d4y83npa8p-flipperzero-firmware-wPlugins-c86c2a2", - "sha256": "1mhk67g3wk4qsiqib36zzmn2a6y63595fbkabfv9vsz65xghx404", + "rev": "80bbb89c6bb2c08ab3af94e3834bfb0edf36097c", + "date": "2023-07-18T14:12:32-04:00", + "path": "/nix/store/fmixzc8wrgw74lnh4dalh8y0knr87q27-flipperzero-firmware-wPlugins-80bbb89", + "sha256": "11ji5p3r0fhqpdgw1f4i07rhizxcxmgjnnmjpjdiffm4rn9yz2nl", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false }, - "version": "RM0525-0040-0.83.2-c86c2a2", - "upstreamVersion": "0.83.2" + "version": "RM0718-1422-0.86.3-80bbb89", + "upstreamVersion": "0.86.3" }