From e933e97af25f473fabfc46db5fc1c825537f9adf Mon Sep 17 00:00:00 2001
From: Naushir Patuck <naush@raspberrypi.com>
Date: Mon, 6 Oct 2025 09:32:06 +0100
Subject: [PATCH] build: Simplify the version file generation

Remove the gen-dist.sh script and do not add the git sha if we are doing
and out-of-tree build. Instead, rely only on the version provided by the
meson project.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
---
 src/meson.build   | 11 -----------
 utils/gen-dist.sh |  7 -------
 utils/version.py  | 10 +---------
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100755 utils/gen-dist.sh

diff --git a/src/meson.build b/src/meson.build
index 7a52c44..6ace2ff 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -33,19 +33,8 @@ add_project_arguments(logging_args, language : 'cpp')
 # Needed to avoid (erroneous) warnings on the use of addresses of fields in __attribute__((packed)) structs.
 add_project_arguments('-Wno-address-of-packed-member', language : 'cpp')
 
-meson.add_dist_script(meson.project_source_root() / 'utils' / 'gen-dist.sh')
-
 # Generate a version string:
 version_cmd = [meson.project_source_root() / 'utils' / 'version.py', meson.project_version()]
-
-# Check if a version.gen file is present.
-# This would have been generated from the meson dist command.
-fs = import('fs')
-dist_version_file = meson.project_source_root() / 'version.gen'
-if fs.is_file(dist_version_file)
-    version_cmd += fs.read(dist_version_file)
-endif
-
 version_template = meson.project_source_root() / 'utils' / 'version.cpp.in'
 version_cpp = vcs_tag(command : version_cmd,
                       input : version_template,
diff --git a/utils/gen-dist.sh b/utils/gen-dist.sh
deleted file mode 100755
index 165d1b6..0000000
--- a/utils/gen-dist.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: BSD-2-Clause
-# Copyright (C) 2023, Raspberry Pi Ltd
-
-cd "$MESON_SOURCE_ROOT" || return
-git rev-parse HEAD > "$MESON_DIST_ROOT"/version.gen
diff --git a/utils/version.py b/utils/version.py
index d5a85c1..b017646 100755
--- a/utils/version.py
+++ b/utils/version.py
@@ -38,21 +38,13 @@ def generate_version():
             if r.returncode:
                 commit = commit + '-dirty'
 
-        elif len(sys.argv) == 3:
-            commit = sys.argv[2].lower().strip()
-            if any(c not in hexdigits for c in commit):
-                raise RuntimeError('Invalid git sha!')
-
-            commit = commit[0:digits]
-      
         else:
             raise RuntimeError('Invalid number of command line arguments') 
 
         commit = f'v{sys.argv[1]} {commit}'
 
     except RuntimeError as e:
-        print(f'ERR: {e}', file=sys.stderr)
-        commit = '0' * digits + '-invalid'
+        commit = f'v{sys.argv[1]}'
 
     finally:
         date_str = time.strftime(