From 5d1499e61a58a313eaaf685d083e442bbd962ca2 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 16 Apr 2020 21:50:16 +0200 Subject: T2305: include release train in "show version" output --- scripts/build-config | 1 + scripts/live-build-config | 3 ++- scripts/make-version-file | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build-config b/scripts/build-config index 617166c3..9368b962 100755 --- a/scripts/build-config +++ b/scripts/build-config @@ -124,6 +124,7 @@ args['distribution'] = build_defaults["debian_distribution"] args['build_dir'] = os.path.join(os.getcwd(), 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/live-build-config b/scripts/live-build-config index 1b3b4541..4fedfeb1 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -57,7 +57,8 @@ lb config noauto \ --firmware-binary false \ --updates false \ --security true \ - --apt-options "--yes -oAcquire::Check-Valid-Until=false" \ + --apt-options "--yes -oAcquire::Check-Valid-Until=false -oDebug::BuildDeps=true -oDebug::pkgDepCache::AutoInstall=true \ + -oDebug::pkgDepCache::Marker=true -oDebug::pkgProblemResolver=true -oDebug::Acquire::gpgv=true" \ --apt-indices false "${@}" """ diff --git a/scripts/make-version-file b/scripts/make-version-file index 4df2cb6c..48e1740f 100755 --- a/scripts/make-version-file +++ b/scripts/make-version-file @@ -77,7 +77,8 @@ version_data = { 'built_by': build_config['build_by'], 'built_on': build_date, 'build_uuid': build_uuid, - 'build_git': build_git + 'build_git': build_git, + 'release_train': build_config['release_train'] } os.makedirs(os.path.join(defaults.CHROOT_INCLUDES_DIR, 'usr/share/vyos'), exist_ok=True) -- cgit v1.2.3