yay! iPXE fixed. but i can definitely implement the usb and iso better by hand.
This commit is contained in:
parent
23c6cc7101
commit
82b919958a
@ -82,6 +82,13 @@ def parseConfig(confs):
|
|||||||
# Two possibilities.
|
# Two possibilities.
|
||||||
# e.g. 1 commit after tag with 7-digit object hex: ['v3.10', '1', 'gb4a5e40']
|
# e.g. 1 commit after tag with 7-digit object hex: ['v3.10', '1', 'gb4a5e40']
|
||||||
# Or if were sitting on a tag with no commits: ['v3.10']
|
# Or if were sitting on a tag with no commits: ['v3.10']
|
||||||
|
# So we want our REAL version to be the following:
|
||||||
|
# Tagged release: v#.##
|
||||||
|
# X number of commits after release: v#.##rX
|
||||||
|
# Both have the (local) build number appended to the deliverables,
|
||||||
|
# which is reset for an empty isodir OR a new tagged release (incl.
|
||||||
|
# commits on top of a new tagged release). e.g. for build Y:
|
||||||
|
# v#.##-Y or v#.##rX-Y
|
||||||
if config_dict['bdisk']['ver'] == '':
|
if config_dict['bdisk']['ver'] == '':
|
||||||
repo = git.Repo(config_dict['build']['basedir'])
|
repo = git.Repo(config_dict['build']['basedir'])
|
||||||
refs = repo.git.describe(repo.head.commit).split('-')
|
refs = repo.git.describe(repo.head.commit).split('-')
|
||||||
@ -89,8 +96,6 @@ def parseConfig(confs):
|
|||||||
config_dict['bdisk']['ver'] = refs[0] + 'r' + refs[1]
|
config_dict['bdisk']['ver'] = refs[0] + 'r' + refs[1]
|
||||||
else:
|
else:
|
||||||
config_dict['bdisk']['ver'] = refs[0]
|
config_dict['bdisk']['ver'] = refs[0]
|
||||||
for i in ('http', 'tftp', 'rsync', 'git'):
|
|
||||||
config_dict['sync'][i] = config['sync'].getboolean(i)
|
|
||||||
# And the build number.
|
# And the build number.
|
||||||
# TODO: support tracking builds per version. i.e. in buildnum:
|
# TODO: support tracking builds per version. i.e. in buildnum:
|
||||||
# v2.51r13:0
|
# v2.51r13:0
|
||||||
|
@ -106,22 +106,23 @@ def buildIPXE(conf):
|
|||||||
#modenv['CERT'] = '{0},{1}'.format(ipxe_ssl_ca, ipxe_ssl_crt) # TODO: test these
|
#modenv['CERT'] = '{0},{1}'.format(ipxe_ssl_ca, ipxe_ssl_crt) # TODO: test these
|
||||||
#modenv['PRIVKEY'] = ipxe_ssl_ckey # TODO: test these
|
#modenv['PRIVKEY'] = ipxe_ssl_ckey # TODO: test these
|
||||||
build_cmd = {}
|
build_cmd = {}
|
||||||
|
# This build include the USB image.
|
||||||
build_cmd['base'] = ['/usr/bin/make',
|
build_cmd['base'] = ['/usr/bin/make',
|
||||||
'all',
|
'all',
|
||||||
'EMBED="{0}"'.format(embedscript)]
|
'EMBED={0}'.format(embedscript)]
|
||||||
# TODO: copy the UNDI stuff/chainloader to tftpboot, if enabled
|
# TODO: copy the UNDI stuff/chainloader to tftpboot, if enabled
|
||||||
build_cmd['undi'] = ['/usr/bin/make',
|
build_cmd['undi'] = ['/usr/bin/make',
|
||||||
'bin/ipxe.pxe',
|
'bin/ipxe.pxe',
|
||||||
'EMBED="{0}"'.format(embedscript)]
|
'EMBED={0}'.format(embedscript)]
|
||||||
build_cmd['efi'] = ['/usr/bin/make',
|
build_cmd['efi'] = ['/usr/bin/make',
|
||||||
'bin-i386-efi/ipxe.efi',
|
'bin-i386-efi/ipxe.efi',
|
||||||
'bin-x86_64-efi/ipxe.efi',
|
'bin-x86_64-efi/ipxe.efi',
|
||||||
'EMBED="{0}"'.format(embedscript)]
|
'EMBED={0}'.format(embedscript)]
|
||||||
# Command to build the actual USB and Mini images
|
# Command to build the actual mini image
|
||||||
build_cmd['iso'] = ['/usr/bin/make',
|
build_cmd['iso'] = ['/usr/bin/make',
|
||||||
'bin/ipxe.liso',
|
'bin/ipxe.liso',
|
||||||
'bin/ipxe.eiso',
|
'bin/ipxe.eiso',
|
||||||
'EMBED="{0}"'.format(embedscript)]
|
'EMBED={0}'.format(embedscript)]
|
||||||
# Now we call the commands.
|
# Now we call the commands.
|
||||||
DEVNULL = open(os.devnull, 'w')
|
DEVNULL = open(os.devnull, 'w')
|
||||||
if os.path.isfile(build['dlpath'] + '/ipxe.log'):
|
if os.path.isfile(build['dlpath'] + '/ipxe.log'):
|
||||||
|
Loading…
Reference in New Issue
Block a user