From 47ed8ac83a67fcd4f10b4e4dc9a13c7f75516f57 Mon Sep 17 00:00:00 2001 From: Yoann Congal Date: Sat, 3 Aug 2024 01:35:53 +0200 Subject: spirv-tools: Fix git-describe related reproducibility This reproducibility problem comes down to git-describe output. Fixes this by using an environment variable to force the description and use it to set this description to ${PV} Fixes [YOCTO #15567]. (From OE-Core rev: fa7ab8f9afaeeba9e2b2806f28e7e9cbd2595353) Signed-off-by: Yoann Congal Signed-off-by: Richard Purdie --- ...d_version.py-support-an-envvar-to-force-t.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 meta/recipes-graphics/spir/spirv-tools/0001-update_build_version.py-support-an-envvar-to-force-t.patch (limited to 'meta/recipes-graphics/spir/spirv-tools') diff --git a/meta/recipes-graphics/spir/spirv-tools/0001-update_build_version.py-support-an-envvar-to-force-t.patch b/meta/recipes-graphics/spir/spirv-tools/0001-update_build_version.py-support-an-envvar-to-force-t.patch new file mode 100644 index 0000000000..edcbf506b9 --- /dev/null +++ b/meta/recipes-graphics/spir/spirv-tools/0001-update_build_version.py-support-an-envvar-to-force-t.patch @@ -0,0 +1,43 @@ +From 39b6385454d705128e684ed779ba9620e2ead1e2 Mon Sep 17 00:00:00 2001 +From: Yoann Congal +Date: Thu, 1 Aug 2024 18:58:04 +0200 +Subject: [PATCH] update_build_version.py: support an envvar to force the + description + +FORCED_BUILD_VERSION_DESCRIPTION envvar can be used to force a version +description instead of resorting to git describe which can change for a +given commit if multiple lightweight commits point ot it. + +Signed-off-by: Yoann Congal +Upstream-Status: Submitted [https://github.com/KhronosGroup/SPIRV-Tools/pull/5758] +--- + utils/update_build_version.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/utils/update_build_version.py b/utils/update_build_version.py +index bb66e18a..9115cab1 100755 +--- a/utils/update_build_version.py ++++ b/utils/update_build_version.py +@@ -24,9 +24,10 @@ + # - The software version deduced from the given CHANGES file. + # - A longer string with the project name, the software version number, and + # git commit information for the CHANGES file's directory. The commit +-# information is the output of "git describe" if that succeeds, or "git +-# rev-parse HEAD" if that succeeds, or otherwise a message containing the +-# phrase "unknown hash". ++# information is the content of the FORCED_BUILD_VERSION_DESCRIPTION ++# environement variable is it exists, else the output of "git describe" if ++# that succeeds, or "git rev-parse HEAD" if that succeeds, or otherwise a ++# message containing the phrase "unknown hash". + # The string contents are escaped as necessary. + + import datetime +@@ -150,7 +151,7 @@ def main(): + sys.exit(1) + + repo_path = os.path.dirname(changes_file_path) +- description = describe(repo_path) ++ description = os.getenv("FORCED_BUILD_VERSION_DESCRIPTION", describe(repo_path)) + content = OUTPUT_FORMAT.format(version_tag=version, description=description) + + # Escape file content. -- cgit v1.2.3-54-g00ecf