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

Don't use buildroot repo by default

Browse source
This commit is contained in:
Tomas Kopecek 2024-05-09 12:04:33 +02:00
parent b13d481d56
commit dd594826f2
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/builder/kiwi.py
View file

@ -351,7 +351,7 @@ class KiwiCreateImageTask(BaseBuildTask):
# user repos # user repos
repos = self.opts.get('repos', []) repos = self.opts.get('repos', [])
if self.opts.get('use_buildroot_repo', True): if self.opts.get('use_buildroot_repo', False):
path_info = koji.PathInfo(topdir=self.options.topurl) path_info = koji.PathInfo(topdir=self.options.topurl)
repopath = path_info.repo(repo_info['id'], target_info['build_tag_name']) repopath = path_info.repo(repo_info['id'], target_info['build_tag_name'])
baseurl = '%s/%s' % (repopath, arch) baseurl = '%s/%s' % (repopath, arch)

12
plugins/cli/kiwi.py
View file

@ -34,10 +34,10 @@ def handle_kiwi_build(goptions, session, args):
parser.add_option("--result-bundle-name-format", help="Override default bundle name format") parser.add_option("--result-bundle-name-format", help="Override default bundle name format")
parser.add_option("--make-prep", action="store_true", default=False, parser.add_option("--make-prep", action="store_true", default=False,
help="Run 'make prep' in checkout before starting the build") help="Run 'make prep' in checkout before starting the build")
parser.add_option("--no-buildroot-repo", action="store_false", parser.add_option("--buildroot-repo", action="store_false",
dest="use_buildroot_repo", default=True, dest="use_buildroot_repo", default=False,
help="Don't add buildroot repo to installation sources, " help="Add buildroot repo to installation sources. This is off by default, "
"use only those provided by --repo option.") "but uf there is no --repo used, it will be turned on automatically.")
parser.add_option("--can-fail", action="store", dest="optional_arches", parser.add_option("--can-fail", action="store", dest="optional_arches",
metavar="ARCH1,ARCH2,...", default="", metavar="ARCH1,ARCH2,...", default="",
help="List of archs which are not blocking for build " help="List of archs which are not blocking for build "
@ -84,8 +84,8 @@ def handle_kiwi_build(goptions, session, args):
kwargs['arches'] = [canonArch(arch) for arch in options.arches] kwargs['arches'] = [canonArch(arch) for arch in options.arches]
if options.repo: if options.repo:
kwargs['repos'] = options.repo kwargs['repos'] = options.repo
if not options.use_buildroot_repo: if options.use_buildroot_repo or not options.repo:
kwargs['use_buildroot_repo'] = False kwargs['use_buildroot_repo'] = True
task_id = session.kiwiBuild(**kwargs) task_id = session.kiwiBuild(**kwargs)

4
plugins/hub/kiwi.py
View file

@ -62,8 +62,8 @@ def kiwiBuild(target, arches, desc_url, desc_path, optional_arches=None, profile
opts['make_prep'] = True opts['make_prep'] = True
if type: if type:
opts['type'] = type opts['type'] = type
if not use_buildroot_repo: if use_buildroot_repo:
opts['use_buildroot_repo'] = False opts['use_buildroot_repo'] = True
if type_attr: if type_attr:
opts['type_attr'] = type_attr opts['type_attr'] = type_attr
if result_bundle_name_format: if result_bundle_name_format: