mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-23 05:26:16 +01:00
Code

- fix the general architecture detection for incomplete "osc build" lines

Browse Source
This commit is contained in:
Adrian Schröter 2013-04-16 15:42:37 +02:00
parent b99233e3ae
commit e1291fdcc6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osc/build.py
View File

@ -53,8 +53,6 @@ qemu_can_build = [ 'armv4l', 'armv5el', 'armv5l', 'armv6l', 'armv7l', 'armv6el',
] ]
can_also_build = { can_also_build = {
'aarch64':['aarch64'],
'armv4l': [ 'armv4l' ],
'armv6l' :[ 'armv4l', 'armv5l', 'armv6l', 'armv5el', 'armv6el' ], 'armv6l' :[ 'armv4l', 'armv5l', 'armv6l', 'armv5el', 'armv6el' ],
'armv7l' :[ 'armv4l', 'armv5l', 'armv6l', 'armv7l', 'armv5el', 'armv6el', 'armv7el' ], 'armv7l' :[ 'armv4l', 'armv5l', 'armv6l', 'armv7l', 'armv5el', 'armv6el', 'armv7el' ],
'armv5el':[ 'armv4l', 'armv5l', 'armv5el' ], # not existing arch, just for compatibility 'armv5el':[ 'armv4l', 'armv5l', 'armv5el' ], # not existing arch, just for compatibility
@ -66,7 +64,6 @@ can_also_build = {
'armv5tel':[ 'armv4l', 'armv5el', 'armv5tel' ], 'armv5tel':[ 'armv4l', 'armv5el', 'armv5tel' ],
's390x': ['s390' ], 's390x': ['s390' ],
'ppc64': [ 'ppc', 'ppc64' ], 'ppc64': [ 'ppc', 'ppc64' ],
'sh4': [ 'sh4' ],
'i586': [ 'i386' ], 'i586': [ 'i386' ],
'i686': [ 'i586', 'i386' ], 'i686': [ 'i586', 'i386' ],
'x86_64': ['i686', 'i586', 'i386' ], 'x86_64': ['i686', 'i586', 'i386' ],

13
osc/commandline.py
View File

@ -5112,14 +5112,21 @@ Please submit there instead, or use --nodevelproject to force direct submission.
import glob import glob
arg_arch = arg_repository = arg_descr = None arg_arch = arg_repository = arg_descr = None
if len(args) < 3: if len(args) < 3:
# some magic, works only sometimes, but people seem to like it :/
all_archs = []
for mainarch in osc.build.can_also_build:
all_archs.append(mainarch)
for subarch in osc.build.can_also_build.get(mainarch):
all_archs.append(subarch)
for arg in args: for arg in args:
if arg.endswith('.spec') or arg.endswith('.dsc') or arg.endswith('.kiwi') or arg == 'PKGBUILD': if arg.endswith('.spec') or arg.endswith('.dsc') or arg.endswith('.kiwi') or arg == 'PKGBUILD':
arg_descr = arg arg_descr = arg
else: else:
if (arg in osc.build.hostarch or osc.build.can_also_build.get(arg) != None) and arg_arch is None: if (arg == osc.build.hostarch or arg in all_archs) and arg_arch is None:
# it seems to be an architecture in general
arg_arch = arg arg_arch = arg
if not (arg in osc.build.can_also_build.get(osc.build.hostarch, []) or arg in osc.build.hostarch): if not (arg in osc.build.can_also_build.get(osc.build.hostarch) or arg == osc.build.hostarch):
print("WARNING: native compile is not possible, an emulator must be configured!") print "WARNING: native compile is not possible, an emulator must be configured!"
elif not arg_repository: elif not arg_repository:
arg_repository = arg arg_repository = arg
else: else: