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

T5121: Remove code of T5120

Browse Source
This commit is contained in:
sskaje 2023-03-30 11:54:28 +08:00
parent 4995bcb5b8
commit 8fcd043483
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/build-vyos-image
View File

@ -145,8 +145,7 @@ if __name__ == "__main__":
'vyos-mirror': ('VyOS package mirror', None, None), 'vyos-mirror': ('VyOS package mirror', None, None),
'build-type': ('Build type, release or development', None, lambda x: x in ['release', 'development']), 'build-type': ('Build type, release or development', None, lambda x: x in ['release', 'development']),
'version': ('Version number (release builds only)', None, None), 'version': ('Version number (release builds only)', None, None),
'build-comment': ('Optional build comment', lambda: '', None), 'build-comment': ('Optional build comment', lambda: '', None)
'debian-mirror-server': ('Replace (deb|security).debian.org to debian-mirror-server in all debian mirror settings (e.g. mirrors.bit.edu.cn)', None, None)
} }
# Create the option parser # Create the option parser
@ -212,22 +211,6 @@ if __name__ == "__main__":
if pre_build_config['pbuilder_debian_mirror'] is None: if pre_build_config['pbuilder_debian_mirror'] is None:
args['pbuilder_debian_mirror'] = pre_build_config['pbuilder_debian_mirror'] = pre_build_config['debian_mirror'] args['pbuilder_debian_mirror'] = pre_build_config['pbuilder_debian_mirror'] = pre_build_config['debian_mirror']
# Replace (deb|security).debian.org to debian_mirror_server if it's set
if args['debian_mirror_server'] is not None:
args['debian_mirror'] = re.sub('(deb|security).debian.org', args['debian_mirror_server'], pre_build_config['debian_mirror'])
args['debian_security_mirror'] = re.sub('(deb|security).debian.org', args['debian_mirror_server'], pre_build_config['debian_security_mirror'])
args['pbuilder_debian_mirror'] = re.sub('(deb|security).debian.org', args['debian_mirror_server'], pre_build_config['pbuilder_debian_mirror'])
# overwrite data/live-build-config/archives/buster.list.chroot
with open('data/live-build-config/archives/buster.list.chroot', 'w+') as fp:
print(fp.read())
buster_repo = """
deb http://deb.debian.org/debian/ buster main non-free
deb http://deb.debian.org/debian/ buster-updates main non-free
deb http://security.debian.org/debian-security buster/updates main non-free
"""
fp.write(re.sub('(deb|security).debian.org', args['debian_mirror_server'], buster_repo))
# Version can only be set for release builds, # Version can only be set for release builds,
# for dev builds it hardly makes any sense # for dev builds it hardly makes any sense
if pre_build_config['build_type'] == 'development': if pre_build_config['build_type'] == 'development':