yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also remove 'arm' scope

Browse Source
This commit is contained in:
Stephan Kulow 2018-12-03 19:33:54 +01:00
parent 1eee0c68de
commit c31c259530
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osclib/conf.py
View File

@ -98,8 +98,6 @@ DEFAULT = {
# - F-C-C submitter requests (maxlin_factory)
'unselect-cleanup-whitelist': 'leaper maxlin_factory',
'pkglistgen-archs': 'x86_64',
'pkglistgen-archs-arm': 'aarch64',
'pkglistgen-archs-ports': 'aarch64 ppc64le',
'pkglistgen-locales-from': 'openSUSE.product',
'pkglistgen-include-suggested': 'False',
'pkglistgen-delete-kiwis-rings': 'openSUSE-ftp-ftp-x86_64.kiwi openSUSE-cd-mini-x86_64.kiwi',

14
pkglistgen.py
View File

@ -747,7 +747,7 @@ class PkgListGen(ToolBase.ToolBase):
class CommandLineInterface(ToolBase.CommandLineInterface):
SCOPES = ['all', 'target', 'rings', 'staging', 'arm']
SCOPES = ['all', 'target', 'rings', 'staging']
def __init__(self, *args, **kwargs):
ToolBase.CommandLineInterface.__init__(self, args, kwargs)
@ -1203,10 +1203,7 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
os.environ['OBS_NAME'] = 'build.suse.de'
target_config = conf.config[target_project]
if opts.scope == 'arm':
archs_key = 'pkglistgen-archs-arm'
else:
archs_key = 'pkglistgen-archs'
archs_key = 'pkglistgen-archs'
if archs_key in target_config:
self.options.architectures = target_config.get(archs_key).split(' ')
@ -1215,11 +1212,6 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
if opts.scope == 'target':
self.repos = self.tool.expand_repos(target_project, main_repo)
self.update_and_solve_target_wrapper(api, target_project, target_config, main_repo, opts, drop_list=True)
elif opts.scope == 'arm':
main_repo = 'ports'
opts.project += ':ARM'
self.repos = self.tool.expand_repos(opts.project, main_repo)
self.update_and_solve_target_wrapper(api, target_project, target_config, main_repo, opts, drop_list=True)
elif opts.scope == 'rings':
opts.project = api.rings[1]
self.repos = self.tool.expand_repos(api.rings[1], main_repo)
@ -1318,7 +1310,7 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
self.tool.update_repos(opts)
nonfree = target_config.get('nonfree')
if opts.scope != 'arm' and nonfree and drop_list:
if nonfree and drop_list:
print('-> do_update nonfree')
# Switch to nonfree repo (ugly, but that's how the code was setup).