From ebe5419dbcfdb802e90c7f7f5d0e393dc6831c01 Mon Sep 17 00:00:00 2001 From: Zhang Qiang Date: Thu, 21 Feb 2013 12:21:47 -0500 Subject: [PATCH] Remove deprecated arch list and update --arch help info Change-Id: Ida78cf2f0157b3b1935ea6653b1e0ccc2d0cb488 --- gitbuildsys/cmd_build.py | 12 ------------ tools/gbs | 4 +++- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py index 046f1d1..f581d6b 100644 --- a/gitbuildsys/cmd_build.py +++ b/gitbuildsys/cmd_build.py @@ -45,17 +45,9 @@ CHANGE_PERSONALITY = { 'sparcv8': 'linux32', } -DEPRECATEDARCHES = [ - 'ia32', - 'i686', - 'i386', - ] SUPPORTEDARCHS = [ 'x86_64', - 'ia32', - 'i686', 'i586', - 'i386', 'armv6l', 'armv7hl', 'armv7l', @@ -230,10 +222,6 @@ def main(args): if not buildarch in SUPPORTEDARCHS: raise GbsError('arch %s not supported, supported archs are: %s ' % \ (buildarch, ','.join(SUPPORTEDARCHS))) - if buildarch in DEPRECATEDARCHES: - log.warning('build arch: %s is deprecated, and will not be supportted ' - 'in next gbs version, please use i586 instead' % buildarch) - buildarch = 'i586' if buildarch not in CAN_ALSO_BUILD.get(hostarch, []): if buildarch not in QEMU_CAN_BUILD: diff --git a/tools/gbs b/tools/gbs index 3d6ff86..44ca7fa 100755 --- a/tools/gbs +++ b/tools/gbs @@ -27,6 +27,7 @@ from gitbuildsys import __version__ from gitbuildsys import errors from gitbuildsys.parsing import subparser, GbsHelpFormatter, basename_type from gitbuildsys import log +from gitbuildsys import cmd_build @subparser @@ -139,7 +140,8 @@ def build_parser(parser): 'dependency order') group = parser.add_argument_group('build configuration options') - group.add_argument('-A', '--arch', help='build target arch ') + group.add_argument('-A', '--arch', help='build target arch. Supported arch ' + 'types are: %s' % ' '.join(cmd_build.SUPPORTEDARCHS)) group.add_argument('-D', '--dist', help='specify project (build) configuration file') group.add_argument('-P', '--profile', -- 2.7.4