diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2023-03-09 19:21:15 +0200 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2023-03-21 23:30:58 +0000 |
| commit | d34cefad17918a37e48c2a9fadd63480e6661d6e (patch) | |
| tree | caf2070d593ba3bc671fcadf571bc65f6eefc4a4 | |
| parent | 2ccca099d3cbdfa32f0a8bfd2168873b7b803159 (diff) | |
meson: Fix git version parsing
When extracting the build metadata from the git version, we use the
string strip() method to remove the version prefix. This is incorrect,
as the strip() method takes a set of characters to be removed, not a
literal string. Fix it by splitting the git version string on the '+'
character and keeping the suffix.
Fixes: 02518e598e8f ("meson: Rewrite .replace usage")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Michael Riesch <michael.riesch@wolfvision.net>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
| -rw-r--r-- | meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 0f89b45a..189e9773 100644 --- a/meson.build +++ b/meson.build @@ -41,8 +41,8 @@ if libcamera_version != project_version # Replace the version components reported by git with the release version, # but keep all trailing information supplied by git. - libcamera_git_version = (project_version + - libcamera_git_version.strip(libcamera_version)) + libcamera_git_version = (project_version + '+' + + libcamera_git_version.split('+')[1]) libcamera_version = project_version # Append a marker to show we have modified this version string |