merge_dtbs: Craft unique name for final saved merged trees
Incorporate the hash of a combination of all msm-ids, board-ids, and
pmic-ids of the InnerMergedDeviceTree in the final filenames of the
saved InnerMergedDeviceTrees.
Change-Id: I629e1a274b23d71061c547578d1ddbcf92c8cf79
Signed-off-by: Guru Das Srinagesh <quic_gurus@quicinc.com>
Signed-off-by: Jis G Jacob <studiokeys@blissroms.org>
diff --git a/build/tools/merge_dtbs.py b/build/tools/merge_dtbs.py
index 17778af..4c70c7e 100755
--- a/build/tools/merge_dtbs.py
+++ b/build/tools/merge_dtbs.py
@@ -347,7 +347,10 @@
def get_name(self):
ext = os.path.splitext(os.path.basename(self.base))[1]
base_parts = self.filename_to_parts(self.base)
- return '-'.join(chain.from_iterable([base_parts] + [self.filename_to_parts(tp.filename, ignored_parts=base_parts) for tp in self.techpacks])) + ext
+ name_hash = hex(hash((self.plat_id, self.board_id, self.pmic_id)))
+ name = '-'.join(chain.from_iterable([base_parts] + [self.filename_to_parts(tp.filename, ignored_parts=base_parts) for tp in self.techpacks]))
+ final_name = '-'.join([name, name_hash]) + ext
+ return final_name
@staticmethod
def filename_to_parts(name, ignored_parts=[]):