From 2cc76aabfd1fa5503aec3c680b163cf24e1d41f6 Mon Sep 17 00:00:00 2001 From: Yukai Li Date: Sun, 21 May 2023 23:40:24 -0600 Subject: [PATCH 1/2] fbt: Fix tar uid overflow when packaging --- scripts/sconsdist.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py index d2d1d2f49c95..dd57e58a5060 100644 --- a/scripts/sconsdist.py +++ b/scripts/sconsdist.py @@ -271,7 +271,13 @@ def bundle_update_package(self): self.note_dist_component( "update", "tgz", self.get_dist_path(bundle_tgz) ) - tar.add(bundle_dir, arcname=bundle_dir_name) + + # Strip uid and gid in case of overflow + def tar_filter(tarinfo): + tarinfo.uid = tarinfo.gid = 0 + return tarinfo + + tar.add(bundle_dir, arcname=bundle_dir_name, filter=tar_filter) return bundle_result From 1e381ce309dfbd6c6a52a683fd74d8170c2a1160 Mon Sep 17 00:00:00 2001 From: Yukai Li Date: Mon, 22 May 2023 01:39:53 -0600 Subject: [PATCH 2/2] Fix trailing spaces --- scripts/sconsdist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py index dd57e58a5060..461781136559 100644 --- a/scripts/sconsdist.py +++ b/scripts/sconsdist.py @@ -276,7 +276,7 @@ def bundle_update_package(self): def tar_filter(tarinfo): tarinfo.uid = tarinfo.gid = 0 return tarinfo - + tar.add(bundle_dir, arcname=bundle_dir_name, filter=tar_filter) return bundle_result