Skip to content

Commit

Permalink
ansible/roles/buildmaster/templates/master.cfg.j2: rename masterdir
Browse files Browse the repository at this point in the history
  • Loading branch information
classabbyamp committed Jan 17, 2024
1 parent a62d028 commit 9cc381e
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions ansible/roles/buildmaster/templates/master.cfg.j2
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ for m in user_settings.machines:
builddir = WithProperties("%s", 'buildnumber')
distdir = 'void-packages'
bulkdir = 'xbps-bulk'
masterdir = 'chroot'
buildroot = 'chroot'
hostdir = m['hostdir']
crosstarget = m['crosstarget']
subarch = m['subarch']
Expand All @@ -72,16 +72,16 @@ for m in user_settings.machines:
bulk_url = 'https://github.com/void-linux/xbps-bulk.git'

BootstrapZap = """
{distdir}/xbps-src -m {masterdir} zap
""".format(distdir=distdir, masterdir=masterdir)
{distdir}/xbps-src -B {buildroot} zap
""".format(distdir=distdir, buildroot=buildroot)

BootstrapUpdate = """
{distdir}/xbps-src -m {masterdir} -H {hostdir} bootstrap-update
""".format(distdir=distdir, masterdir=masterdir, hostdir=hostdir)
{distdir}/xbps-src -B {buildroot} -H {hostdir} bootstrap-update
""".format(distdir=distdir, buildroot=buildroot, hostdir=hostdir)

BootstrapInstall = """
{distdir}/xbps-src {BootstrapArgs} -m {masterdir} -H {hostdir} binary-bootstrap {subarch}
""".format(BootstrapArgs=BootstrapArgs, distdir=distdir, masterdir=masterdir, hostdir=hostdir, subarch=subarch)
{distdir}/xbps-src {BootstrapArgs} -B {buildroot} -H {hostdir} -A {subarch} binary-bootstrap
""".format(BootstrapArgs=BootstrapArgs, distdir=distdir, buildroot=buildroot, hostdir=hostdir, subarch=subarch)

RemoveObsoletes = """
bash -c 'for repo in {hostdir}/binpkgs {hostdir}/binpkgs/debug {hostdir}/binpkgs/nonfree ; do XBPS_ARCH={mach} xbps-rindex -r $repo ; done'
Expand All @@ -95,7 +95,7 @@ bash -c 'for repo in {hostdir}/binpkgs/multilib {hostdir}/binpkgs/multilib/nonfr
bulk_conf = ["../%s/configure" % bulkdir,
'-a', crosstarget,
'-d', "../%s" % distdir,
'-m', "../%s" % masterdir,
'-B', "../%s" % buildroot,
'-h', hostdir, '-t']
get_pkgs = ['make', 'print_pkgs']
bulk_make = ['make']
Expand All @@ -113,8 +113,8 @@ bash -c 'for repo in {hostdir}/binpkgs/multilib {hostdir}/binpkgs/multilib/nonfr
description=['Updating void-packages from git'],
descriptionDone=['void-packages updated'])
bootzap_step = ShellCommand(command=BootstrapZap, logEnviron=False,
description=['Zapping xbps-src masterdir'],
descriptionDone=['xbps-src masterdir zap'],
description=['Zapping xbps-src buildroot'],
descriptionDone=['xbps-src buildroot zap'],
workdir='.', haltOnFailure=True)
bootup_step = ShellCommand(command=BootstrapUpdate, logEnviron=False,
description=['Updating xbps-src bootstrap pkgs'],
Expand Down

0 comments on commit 9cc381e

Please sign in to comment.