summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-16 18:07:09 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-16 18:07:20 +0200
commit222dde1eb964e57d4aba62d0a921b53ad762a407 (patch)
treed4a3a279480adf9b024a450a82a0bbd6b83d723c /scripts
parent4dbc76e9325229445b2fddda0546c849df93e021 (diff)
downloadvyos-build-222dde1eb964e57d4aba62d0a921b53ad762a407.tar.gz
vyos-build-222dde1eb964e57d4aba62d0a921b53ad762a407.zip
T2305: include release train in "show version" output
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-config1
-rwxr-xr-xscripts/make-version-file1
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/build-config b/scripts/build-config
index 356aa340..fa358675 100755
--- a/scripts/build-config
+++ b/scripts/build-config
@@ -124,6 +124,7 @@ args['distribution'] = build_defaults["debian_distribution"]
args['build_dir'] = defaults.BUILD_DIR
args['pbuilder_config'] = defaults.PBUILDER_CONFIG
args['vyos_branch'] = build_defaults["vyos_branch"]
+args['release_train'] = build_defaults["release_train"]
# Add custom packages from build defaults
if not args['custom_package']:
diff --git a/scripts/make-version-file b/scripts/make-version-file
index a2828434..5f394f3b 100755
--- a/scripts/make-version-file
+++ b/scripts/make-version-file
@@ -95,6 +95,7 @@ version_data = {
'build_uuid': build_uuid,
'build_git': build_git,
'build_branch': git_branch,
+ 'release_train': build_config['release_train'],
'lts_build': lts_build,
'build_comment': build_config['build_comment']
}