vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for --build-type and --version options to configure script.

Browse Source 
Image version will now be passed in configure option.

As a collateral damage, add support for options without default values.
This commit is contained in:
Daniil Baturin 2016-01-26 15:41:47 -05:00
parent 38a250d627
commit b0c41b26b9
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/build-config
View File

@ -50,13 +50,18 @@ options = {
'build-by': ('Builder identifier (e.g. jrandomhacker@example.net)', get_default_build_by, None), 'build-by': ('Builder identifier (e.g. jrandomhacker@example.net)', get_default_build_by, None),
'debian-mirror': ('Debian repository mirror for ISO build', lambda: defaults.DEBIAN_MIRROR, None), 'debian-mirror': ('Debian repository mirror for ISO build', lambda: defaults.DEBIAN_MIRROR, None),
'pbuilder-debian-mirror': ('Debian repository mirror for pbuilder env bootstrap', lambda: defaults.DEBIAN_MIRROR, None), 'pbuilder-debian-mirror': ('Debian repository mirror for pbuilder env bootstrap', lambda: defaults.DEBIAN_MIRROR, None),
'build-type': ('Build type, release or development', lambda: 'development', lambda x: x in ['release', 'development']) 'build-type': ('Build type, release or development', lambda: 'development', lambda x: x in ['release', 'development']),
'version': ('Version number (release builds only)', None, None)
} }
# Create the option parser # Create the option parser
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
for k, v in options.items(): for k, v in options.items():
parser.add_argument('--' + k, type=str, help=v[0], default=v[1]()) help_string, default_value_thunk = v[0], v[1]
if default_value_thunk is None:
parser.add_argument('--' + k, type=str, help=help_string)
else:
parser.add_argument('--' + k, type=str, help=help_string, default=default_value_thunk())
args = vars(parser.parse_args()) args = vars(parser.parse_args())
@ -76,6 +81,14 @@ if (args['debian_mirror'] != defaults.DEBIAN_MIRROR) and \
(args['pbuilder_debian_mirror'] == defaults.DEBIAN_MIRROR): (args['pbuilder_debian_mirror'] == defaults.DEBIAN_MIRROR):
args['pbuilder_debian_mirror'] = args['debian-mirror'] args['pbuilder_debian_mirror'] = args['debian-mirror']
# Version can only be set for release builds,
# for dev builds it hardly makes any sense
if args['build_type'] == 'development':
if args['version'] is not None:
print("Version can only be set for release builds")
print("Use --build-type=release option if you want to set version number")
sys.exit(1)
# Populate some defaults that are not configurable, # Populate some defaults that are not configurable,
# but that are handy to have in the options hash # but that are handy to have in the options hash
args['distribution'] = defaults.DEBIAN_DISTRIBUTION args['distribution'] = defaults.DEBIAN_DISTRIBUTION