kojid: permit forcing releasever within mock per tag

This commit is contained in:
Pat Riehecky 2022-03-04 15:34:52 -06:00 committed by Tomas Kopecek
parent 2af7e756dd
commit a50ca237c7
4 changed files with 8 additions and 0 deletions

View file

@ -301,6 +301,8 @@ class BuildRoot(object):
}
if 'mock.module_setup_commands' in self.config['extra']:
opts['module_setup_commands'] = self.config['extra']['mock.module_setup_commands']
if 'mock.releasever' in self.config['extra']:
opts['releasever'] = self.config['extra']['mock.releasever']
if self.internal_dev_setup is not None:
opts['internal_dev_setup'] = bool(self.internal_dev_setup)
opts['tag_macros'] = {}

View file

@ -1149,6 +1149,8 @@ def anon_handle_mock_config(goptions, session, args):
opts['use_bootstrap'] = buildcfg['extra']['mock.use_bootstrap']
if 'mock.module_setup_commands' in buildcfg['extra']:
opts['module_setup_commands'] = buildcfg['extra']['mock.module_setup_commands']
if 'mock.releasever' in buildcfg['extra']:
opts['releasever'] = buildcfg['extra']['mock.releasever']
opts['tag_macros'] = {}
for key in buildcfg['extra']:
if key.startswith('rpm.macro.'):

View file

@ -393,6 +393,8 @@ environment follows:
* ``mock.new_chroot`` - 0/1 value. If it is set, ``--new-chroot`` or
`--old-chroot` option is appended to any mock call. If it is not set,
mock's default behavior is used.
* ``mock.releasever`` - When doing cross-compiles it may be necessary
to explicitly set the ``releasever`` to be used.
* ``mock.use_bootstrap`` - 0/1 value. If it is set, ``--bootstrap-chroot``
is appended to the mock init call. This tells mock to build in two stages,
using chroot rpm for creating the build chroot. If it is not set, mock's

View file

@ -1638,6 +1638,8 @@ def genMockConfig(name, arch, managed=False, repoid=None, tag_name=None, **opts)
config_opts['use_bootstrap'] = bool(opts['use_bootstrap'])
if 'module_setup_commands' in opts:
config_opts['module_setup_commands'] = opts['module_setup_commands']
if 'releasever' in opts:
config_opts['releasever'] = opts['releasever']
# bind_opts are used to mount parts (or all of) /dev if needed.
# See kojid::LiveCDTask for a look at this option in action.