particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

when writing out the mock configs set the target arch instead of canonical arch used for %_host_cpu and %_host macros and _target_arch variable in the written out configs

Browse source
This commit is contained in:
Dennis Gilmore 2011-11-16 18:02:58 -06:00 • committed by Mike McLean
parent dd48297c04
commit 310d7a0246
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
koji/__init__.py
View file

@ -1240,7 +1240,7 @@ def genMockConfig(name, arch, managed=False, repoid=None, tag_name=None, **opts)
config_opts = {
'root' : name,
'basedir' : mockdir,
'target_arch' : arch,
'target_arch' : opts.get('target_arch', arch),
'chroothome': '/builddir',
# Use the group data rather than a generated rpm
'chroot_setup_cmd': 'groupinstall %s' % opts.get('install_group', 'build'),
@ -1297,8 +1297,8 @@ baseurl=%(url)s
macros = {
'%_topdir' : '%s/build' % config_opts['chroothome'],
'%_rpmfilename' : '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm',
'%_host_cpu' : arch,
'%_host': '%s-%s' % (arch, opts.get('mockhost', 'koji-linux-gnu')),
'%_host_cpu' : opts.get('target_arch', arch),
'%_host': '%s-%s' % (opts.get('target_arch', arch), opts.get('mockhost', 'koji-linux-gnu')),
'%vendor' : opts.get('vendor', 'Koji'),
'%packager' : opts.get('packager', 'Koji'),
'%distribution': opts.get('distribution', 'Unknown')