summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-09-30 18:28:33 +0200
committerGitHub <noreply@github.com>2024-09-30 18:28:33 +0200
commit585361258c789e3226392b97dddf0e78c5c8eef1 (patch)
tree7282e856dc6ec08f903cdff4925e57b4ce2e3f7f
parent4ca17363dd1995526b6b50657961ad158405dcc5 (diff)
parent3f6959d782171e6ea52f4cad73d4062b5be9c9b3 (diff)
downloadvyos-build-585361258c789e3226392b97dddf0e78c5c8eef1.tar.gz
vyos-build-585361258c789e3226392b97dddf0e78c5c8eef1.zip
Merge pull request #775 from vyos/mergify/bp/circinus/pr-773
build: T6738: add build_type field to version data instead of the very limited and unused lts_build (backport #773)
-rwxr-xr-xscripts/image-build/build-vyos-image7
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image
index c13d7607..56e765f7 100755
--- a/scripts/image-build/build-vyos-image
+++ b/scripts/image-build/build-vyos-image
@@ -413,11 +413,6 @@ if __name__ == "__main__":
# Release build, use the version from ./configure arguments
version = build_config['version']
- if build_config['build_type'] == 'development':
- lts_build = False
- else:
- lts_build = True
-
version_data = {
'version': version,
'flavor': build_config["build_flavor"],
@@ -428,7 +423,7 @@ if __name__ == "__main__":
'build_branch': git_branch,
'release_train': build_config['release_train'],
'architecture': build_config['architecture'],
- 'lts_build': lts_build,
+ 'build_type': build_config['build_type'],
'build_comment': build_config['build_comment'],
'bugtracker_url': build_config['bugtracker_url'],
'documentation_url': build_config['documentation_url'],