From c0fd911396eb897070efef1425c67d94d915f54b Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Mon, 28 Aug 2023 12:53:46 +0000 Subject: [PATCH] xtensa-build-zephyr.py: re-enable sof_ri_info.py on MTL and LNL Now we can avoid bitrot again thanks to recent rimage fix https://github.com/thesofproject/rimage/commit/4fb9fe00575bc Also update outdated comments. Signed-off-by: Marc Herbert --- scripts/xtensa-build-zephyr.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py index 6046412cc5c4..8a2b3532708a 100755 --- a/scripts/xtensa-build-zephyr.py +++ b/scripts/xtensa-build-zephyr.py @@ -779,6 +779,11 @@ def build_platforms(): for p_alias in platform_configs[platform].aliases: symlink_or_copy(sof_platform_output_dir, f"sof-{platform}.ldc", f"sof-{p_alias}.ldc") + # reproducible-zephyr.ri is less useful now that show_installed_files() shows + # checksums too. However: - it's still useful when only the .ri file is + # available (no build logs for the other image), - it makes sure sof_ri_info.py + # itself does not bitrot, - it can catch rimage issues, see for instance rimage + # fix 4fb9fe00575b if platform not in RI_INFO_UNSUPPORTED: reproducible_checksum(platform, west_top / platform_build_dir_name / "zephyr" / "zephyr.ri") @@ -968,8 +973,8 @@ def gzip_compress(fname, gzdst=None): RI_INFO_UNSUPPORTED += ['rn'] RI_INFO_UNSUPPORTED += ['mt8186', 'mt8195'] -# sof_ri_info.py has not caught up with the latest rimage yet: these will print a warning. -RI_INFO_FIXME = ['mtl', 'lnl'] +# For temporary workarounds. Unlike _UNSUPPORTED above, the platforms below will print a warning. +RI_INFO_FIXME = [ ] def reproducible_checksum(platform, ri_file):